diff options
author | Joerg Roedel <jroedel@suse.de> | 2015-06-18 04:48:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-10 12:49:33 -0400 |
commit | 396887ba3a77ee7f8b17ea85afa8501262e230b4 (patch) | |
tree | 3e93381391ff31d64a6b017957a5cc06abee5de1 | |
parent | 72e09509a225e553f3736b3822a91f99f8c4777c (diff) |
iommu/amd: Handle large pages correctly in free_pagetable
commit 0b3fff54bc01e8e6064d222a33e6fa7adabd94cd upstream.
Make sure that we are skipping over large PTEs while walking
the page-table tree.
Fixes: 5c34c403b723 ("iommu/amd: Fix memory leak in free_pagetable")
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/iommu/amd_iommu.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index e1c7e9e51045..ca9f4edbb940 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c | |||
@@ -1869,9 +1869,15 @@ static void free_pt_##LVL (unsigned long __pt) \ | |||
1869 | pt = (u64 *)__pt; \ | 1869 | pt = (u64 *)__pt; \ |
1870 | \ | 1870 | \ |
1871 | for (i = 0; i < 512; ++i) { \ | 1871 | for (i = 0; i < 512; ++i) { \ |
1872 | /* PTE present? */ \ | ||
1872 | if (!IOMMU_PTE_PRESENT(pt[i])) \ | 1873 | if (!IOMMU_PTE_PRESENT(pt[i])) \ |
1873 | continue; \ | 1874 | continue; \ |
1874 | \ | 1875 | \ |
1876 | /* Large PTE? */ \ | ||
1877 | if (PM_PTE_LEVEL(pt[i]) == 0 || \ | ||
1878 | PM_PTE_LEVEL(pt[i]) == 7) \ | ||
1879 | continue; \ | ||
1880 | \ | ||
1875 | p = (unsigned long)IOMMU_PTE_PAGE(pt[i]); \ | 1881 | p = (unsigned long)IOMMU_PTE_PAGE(pt[i]); \ |
1876 | FN(p); \ | 1882 | FN(p); \ |
1877 | } \ | 1883 | } \ |