Messages in this thread Patch in this message | | | From | Jiang Liu <> | Subject | [Patch Part1 V3 14/20] iommu/vt-d: avoid double free in error recovery path | Date | Mon, 6 Jan 2014 14:18:21 +0800 |
| |
The g_iommus array will be freed twice when failed to initialize IOMMU devices, so fix the double free.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> --- drivers/iommu/intel-iommu.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 60fa821..ccf7304 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1295,19 +1295,10 @@ static void free_dmar_iommu(struct intel_iommu *iommu) iommu->domains = NULL; iommu->domain_ids = NULL; - g_iommus[iommu->seq_id] = NULL; - - /* if all iommus are freed, free g_iommus */ - for (i = 0; i < g_num_of_iommus; i++) { - if (g_iommus[i]) - break; - } - - if (i == g_num_of_iommus) - kfree(g_iommus); - /* free context mapping */ free_context_table(iommu); + + g_iommus[iommu->seq_id] = NULL; } static struct dmar_domain *alloc_domain(void) @@ -2624,6 +2615,7 @@ error: for_each_active_iommu(iommu, drhd) free_dmar_iommu(iommu); kfree(g_iommus); + g_iommus = NULL; return ret; } -- 1.7.10.4
| |