Commit bb6bccba authored by Aaron Ma's avatar Aaron Ma Committed by Joerg Roedel

iommu/amd: Fix NULL dereference bug in match_hid_uid

Add a non-NULL check to fix potential NULL pointer dereference
Cleanup code to call function once.
Signed-off-by: default avatarAaron Ma <aaron.ma@canonical.com>
Fixes: 2bf9a0a1 ('iommu/amd: Add iommu support for ACPI HID devices')
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent d05e4c86
...@@ -140,10 +140,14 @@ static struct lock_class_key reserved_rbtree_key; ...@@ -140,10 +140,14 @@ static struct lock_class_key reserved_rbtree_key;
static inline int match_hid_uid(struct device *dev, static inline int match_hid_uid(struct device *dev,
struct acpihid_map_entry *entry) struct acpihid_map_entry *entry)
{ {
struct acpi_device *adev = ACPI_COMPANION(dev);
const char *hid, *uid; const char *hid, *uid;
hid = acpi_device_hid(ACPI_COMPANION(dev)); if (!adev)
uid = acpi_device_uid(ACPI_COMPANION(dev)); return -ENODEV;
hid = acpi_device_hid(adev);
uid = acpi_device_uid(adev);
if (!hid || !(*hid)) if (!hid || !(*hid))
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment