* [RESEND][PATCH] iommu/amd: Fix NULL dereference bug in match_hid_uid
@ 2019-03-13 13:53 Aaron Ma
2019-03-15 15:24 ` Joerg Roedel
0 siblings, 1 reply; 2+ messages in thread
From: Aaron Ma @ 2019-03-13 13:53 UTC (permalink / raw)
To: joro, iommu, linux-kernel, aaron.ma
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>
---
drivers/iommu/amd_iommu.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 2a7b78bb98b4..dbda5b86f979 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -140,9 +140,14 @@ static inline int match_hid_uid(struct device *dev,
struct acpihid_map_entry *entry)
{
const char *hid, *uid;
+ struct acpi_device *adev = ACPI_COMPANION(dev);
- 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;
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-15 15:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-13 13:53 [RESEND][PATCH] iommu/amd: Fix NULL dereference bug in match_hid_uid Aaron Ma
2019-03-15 15:24 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).