iommu/amd: Fix NULL dereference bug in match_hid_uid

BugLink: https://bugs.launchpad.net/bugs/1820990
Add a non-NULL check to fix potential NULL pointer dereference
Cleanup code to call function once.

Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
Fixes: 2bf9a0a12749b ('iommu/amd: Add iommu support for ACPI HID devices')
Signed-off-by: Joerg Roedel <jroedel@suse.de>
(cherry picked from commit bb6bccba390c7d743c1e4427de4ef284c8cc6869)
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
Acked-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index b2c8ec7337e2f7458185b76aa2d81c65f10fd814..bb53498be150e212e1c12a2df545e62b4799e35d 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -138,10 +138,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;