From: Joerg Roedel Date: Thu, 18 Jun 2015 08:48:34 +0000 (+0200) Subject: iommu/amd: Handle large pages correctly in free_pagetable X-Git-Tag: v4.9.8~3996^2~4^5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b3fff54bc01e8e6064d222a33e6fa7adabd94cd;p=platform%2Fkernel%2Flinux-rpi3.git iommu/amd: Handle large pages correctly in free_pagetable Make sure that we are skipping over large PTEs while walking the page-table tree. Cc: stable@kernel.org Fixes: 5c34c403b723 ("iommu/amd: Fix memory leak in free_pagetable") Signed-off-by: Joerg Roedel --- diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 4dfadcf..31e90c4 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1866,9 +1866,15 @@ static void free_pt_##LVL (unsigned long __pt) \ pt = (u64 *)__pt; \ \ for (i = 0; i < 512; ++i) { \ + /* PTE present? */ \ if (!IOMMU_PTE_PRESENT(pt[i])) \ continue; \ \ + /* Large PTE? */ \ + if (PM_PTE_LEVEL(pt[i]) == 0 || \ + PM_PTE_LEVEL(pt[i]) == 7) \ + continue; \ + \ p = (unsigned long)IOMMU_PTE_PAGE(pt[i]); \ FN(p); \ } \