diff options
author | Joerg Roedel <jroedel@suse.de> | 2017-06-16 10:09:58 -0400 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2017-06-22 06:54:20 -0400 |
commit | f601927136d69be49f0a14ae820b44c02fa591ba (patch) | |
tree | d9a257e13d87ff0fe163fc36fa4c5c796b2baf1b | |
parent | 151b09031a76ba6b6b83f94953074d6f10aa30b3 (diff) |
iommu/amd: Set global pointers to NULL after freeing them
Avoid any tries to double-free these pointers.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r-- | drivers/iommu/amd_iommu_init.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index a6b81a05a0d1..8cc507f96f3a 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c | |||
@@ -2114,18 +2114,22 @@ static void __init free_iommu_resources(void) | |||
2114 | kmemleak_free(irq_lookup_table); | 2114 | kmemleak_free(irq_lookup_table); |
2115 | free_pages((unsigned long)irq_lookup_table, | 2115 | free_pages((unsigned long)irq_lookup_table, |
2116 | get_order(rlookup_table_size)); | 2116 | get_order(rlookup_table_size)); |
2117 | irq_lookup_table = NULL; | ||
2117 | 2118 | ||
2118 | kmem_cache_destroy(amd_iommu_irq_cache); | 2119 | kmem_cache_destroy(amd_iommu_irq_cache); |
2119 | amd_iommu_irq_cache = NULL; | 2120 | amd_iommu_irq_cache = NULL; |
2120 | 2121 | ||
2121 | free_pages((unsigned long)amd_iommu_rlookup_table, | 2122 | free_pages((unsigned long)amd_iommu_rlookup_table, |
2122 | get_order(rlookup_table_size)); | 2123 | get_order(rlookup_table_size)); |
2124 | amd_iommu_rlookup_table = NULL; | ||
2123 | 2125 | ||
2124 | free_pages((unsigned long)amd_iommu_alias_table, | 2126 | free_pages((unsigned long)amd_iommu_alias_table, |
2125 | get_order(alias_table_size)); | 2127 | get_order(alias_table_size)); |
2128 | amd_iommu_alias_table = NULL; | ||
2126 | 2129 | ||
2127 | free_pages((unsigned long)amd_iommu_dev_table, | 2130 | free_pages((unsigned long)amd_iommu_dev_table, |
2128 | get_order(dev_table_size)); | 2131 | get_order(dev_table_size)); |
2132 | amd_iommu_dev_table = NULL; | ||
2129 | 2133 | ||
2130 | free_iommu_all(); | 2134 | free_iommu_all(); |
2131 | 2135 | ||
@@ -2195,6 +2199,7 @@ static void __init free_dma_resources(void) | |||
2195 | { | 2199 | { |
2196 | free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, | 2200 | free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, |
2197 | get_order(MAX_DOMAIN_ID/8)); | 2201 | get_order(MAX_DOMAIN_ID/8)); |
2202 | amd_iommu_pd_alloc_bitmap = NULL; | ||
2198 | 2203 | ||
2199 | free_unity_maps(); | 2204 | free_unity_maps(); |
2200 | } | 2205 | } |