iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/amd: Fix memory leak in free_pagetable

Browse Source 
The IOMMU pagetables can have up to 6 levels, but the code
in free_pagetable() only releases the first 3 levels. Fix
this leak by releasing all levels.

Reported-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Joerg Roedel 2013-06-20 20:22:58 +02:00
parent 7d13205581
commit 5c34c403b7
1 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
drivers/iommu/amd_iommu.c
View File

@ -1893,34 +1893,59 @@ static void domain_id_free(int id)
write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); write_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
} }
#define DEFINE_FREE_PT_FN(LVL, FN) \
static void free_pt_##LVL (unsigned long __pt) \
{ \
unsigned long p; \
u64 *pt; \
int i; \
\
pt = (u64 *)__pt; \
\
for (i = 0; i < 512; ++i) { \
if (!IOMMU_PTE_PRESENT(pt[i])) \
continue; \
\
p = (unsigned long)IOMMU_PTE_PAGE(pt[i]); \
FN(p); \
} \
free_page((unsigned long)pt); \
}
DEFINE_FREE_PT_FN(l2, free_page)
DEFINE_FREE_PT_FN(l3, free_pt_l2)
DEFINE_FREE_PT_FN(l4, free_pt_l3)
DEFINE_FREE_PT_FN(l5, free_pt_l4)
DEFINE_FREE_PT_FN(l6, free_pt_l5)
static void free_pagetable(struct protection_domain *domain) static void free_pagetable(struct protection_domain *domain)
{ {
int i, j; unsigned long root = (unsigned long)domain->pt_root;
u64 *p1, *p2, *p3;
p1 = domain->pt_root; switch (domain->mode) {
case PAGE_MODE_NONE:
if (!p1) break;
return; case PAGE_MODE_1_LEVEL:
free_page(root);
for (i = 0; i < 512; ++i) { break;
if (!IOMMU_PTE_PRESENT(p1[i])) case PAGE_MODE_2_LEVEL:
continue; free_pt_l2(root);
break;
p2 = IOMMU_PTE_PAGE(p1[i]); case PAGE_MODE_3_LEVEL:
for (j = 0; j < 512; ++j) { free_pt_l3(root);
if (!IOMMU_PTE_PRESENT(p2[j])) break;
continue; case PAGE_MODE_4_LEVEL:
p3 = IOMMU_PTE_PAGE(p2[j]); free_pt_l4(root);
free_page((unsigned long)p3); break;
} case PAGE_MODE_5_LEVEL:
free_pt_l5(root);
free_page((unsigned long)p2); break;
case PAGE_MODE_6_LEVEL:
free_pt_l6(root);
break;
default:
BUG();
} }
free_page((unsigned long)p1);
domain->pt_root = NULL;
} }
static void free_gcr3_tbl_level1(u64 *tbl) static void free_gcr3_tbl_level1(u64 *tbl)