summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2010-11-02 08:05:51 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-01-17 17:21:42 +0100
commit7a6610139a1e1d9297dd1c5d178022eac36839cb (patch)
tree48ffd3762fa1961bfce3001f3783091e29142a58
parentdrivers/nfc/pn544.c: fix min_t warnings (diff)
downloadlinux-7a6610139a1e1d9297dd1c5d178022eac36839cb.tar.xz
linux-7a6610139a1e1d9297dd1c5d178022eac36839cb.zip
intel-iommu: Fix use after release during device attach
Obtain the new pgd pointer before releasing the page containing this value. Cc: stable@kernel.org Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Reviewed-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/pci/intel-iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 4789f8e8bf7a..35463ddf10a1 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -3627,9 +3627,9 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
pte = dmar_domain->pgd;
if (dma_pte_present(pte)) {
- free_pgtable_page(dmar_domain->pgd);
dmar_domain->pgd = (struct dma_pte *)
phys_to_virt(dma_pte_addr(pte));
+ free_pgtable_page(pte);
}
dmar_domain->agaw--;
}