Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa1844c9 authored by Aaron Ma's avatar Aaron Ma Committed by Greg Kroah-Hartman
Browse files

iommu/amd: Fix NULL dereference bug in match_hid_uid 



[ Upstream commit bb6bccba390c7d743c1e4427de4ef284c8cc6869 ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 320ab115

drivers/iommu/amd_iommu.c

+6 −2
Original line number Diff line number Diff line
@@ -139,10 +139,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;