diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-15 14:41:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-15 14:41:30 -0700 |
| commit | 323ea40ff6fb1e9d2c481bff50245ee5f559c8af (patch) | |
| tree | 292cdb60e3ed4d899671fae4bf134b61fae36e95 | |
| parent | 0be288630752e6358d02eba7b283c1783a5c7c38 (diff) | |
| parent | bb6bccba390c7d743c1e4427de4ef284c8cc6869 (diff) | |
| download | linux-323ea40ff6fb1e9d2c481bff50245ee5f559c8af.tar.bz2 | |
Merge tag 'iommu-fix-v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fix from Joerg Roedel:
"Fix a NULL-pointer dereference issue in the ACPI device matching code
of the AMD IOMMU driver"
* tag 'iommu-fix-v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/amd: Fix NULL dereference bug in match_hid_uid
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 6b0760dafb3e..b319e51c379b 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -140,10 +140,14 @@ static struct lock_class_key reserved_rbtree_key; static inline int match_hid_uid(struct device *dev, struct acpihid_map_entry *entry) { + struct acpi_device *adev = ACPI_COMPANION(dev); const char *hid, *uid; - hid = acpi_device_hid(ACPI_COMPANION(dev)); - uid = acpi_device_uid(ACPI_COMPANION(dev)); + if (!adev) + return -ENODEV; + + hid = acpi_device_hid(adev); + uid = acpi_device_uid(adev); if (!hid || !(*hid)) return -ENODEV; |