diff options
| author | Jerry Snitselaar <jsnitsel@redhat.com> | 2020-01-21 17:34:26 -0700 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2020-01-24 15:23:50 +0100 |
| commit | bf708cfb2f4811d1948a88c41ab96587e84ad344 (patch) | |
| tree | 99cf8b28a883c1d690713298386af93bc158c88f /drivers | |
| parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
| download | linux-rpi-bf708cfb2f4811d1948a88c41ab96587e84ad344.tar.gz linux-rpi-bf708cfb2f4811d1948a88c41ab96587e84ad344.tar.bz2 linux-rpi-bf708cfb2f4811d1948a88c41ab96587e84ad344.zip | |
iommu/vt-d: Call __dmar_remove_one_dev_info with valid pointer
It is possible for archdata.iommu to be set to
DEFER_DEVICE_DOMAIN_INFO or DUMMY_DEVICE_DOMAIN_INFO so check for
those values before calling __dmar_remove_one_dev_info. Without a
check it can result in a null pointer dereference. This has been seen
while booting a kdump kernel on an HP dl380 gen9.
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: stable@vger.kernel.org # 5.3+
Cc: linux-kernel@vger.kernel.org
Fixes: ae23bfb68f28 ("iommu/vt-d: Detach domain before using a private one")
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 1801f0aaf013..932267f49f9a 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5163,7 +5163,8 @@ static void dmar_remove_one_dev_info(struct device *dev) spin_lock_irqsave(&device_domain_lock, flags); info = dev->archdata.iommu; - if (info) + if (info && info != DEFER_DEVICE_DOMAIN_INFO + && info != DUMMY_DEVICE_DOMAIN_INFO) __dmar_remove_one_dev_info(info); spin_unlock_irqrestore(&device_domain_lock, flags); } |