diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-12-02 10:18:30 +0000 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-12-08 10:03:06 +0000 |
| commit | 44cd613c0e4cd93079ea2a93aa06649d8ca0830a (patch) | |
| tree | 63eb3d5b97569d4db7fa3eb47201d77eaaccaf46 /drivers/pci | |
| parent | 5595b528b49a702c0428c0762bab60999648254c (diff) | |
| download | op-kernel-dev-44cd613c0e4cd93079ea2a93aa06649d8ca0830a.zip op-kernel-dev-44cd613c0e4cd93079ea2a93aa06649d8ca0830a.tar.gz | |
intel-iommu: Fix oops with intel_iommu=igfx_off
The hotplug notifier will call find_domain() to see if the device in
question has been assigned an IOMMU domain. However, this should never
be called for devices with a "dummy" domain, such as graphics devices
when intel_iommu=igfx_off is set and the corresponding IOMMU isn't even
initialised. If you do that, it'll oops as it dereferences the (-1)
pointer.
The notifier function should check iommu_no_mapping() for the
device before doing anything else.
Cc: stable@kernel.org
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/intel-iommu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 83cabdc..e3e84ca 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c @@ -3247,6 +3247,9 @@ static int device_notifier(struct notifier_block *nb, struct pci_dev *pdev = to_pci_dev(dev); struct dmar_domain *domain; + if (iommu_no_mapping(dev)) + return 0; + domain = find_domain(pdev); if (!domain) return 0; |
