summaryrefslogtreecommitdiffstats
path: root/drivers/pci
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 16:21:42 +0000
commit7a6610139a1e1d9297dd1c5d178022eac36839cb (patch)
tree48ffd3762fa1961bfce3001f3783091e29142a58 /drivers/pci
parente78bf5e6cbe837daa6ab628a5f679548742994d3 (diff)
downloadop-kernel-dev-7a6610139a1e1d9297dd1c5d178022eac36839cb.zip
op-kernel-dev-7a6610139a1e1d9297dd1c5d178022eac36839cb.tar.gz
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>
Diffstat (limited to 'drivers/pci')
-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 4789f8e..35463dd 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--;
}
OpenPOWER on IntegriCloud