Skip to content

Commit 39f8177

Browse files
superm1rafaeljw
authored andcommitted
ACPI: x86: s2idle: Fix a NULL pointer dereference
Ryzen 7000 (Raphael) introduced AMDI0008 for _HID. This ID was added in commit ed470fe ("ACPI: PM: s2idle: Add support for upcoming AMD uPEP HID AMDI008"), but then removed in favor of aligning all new IDs to Rembrandt support in commit fd894f0 ("ACPI: x86: s2idle: If a new AMD _HID is missing assume Rembrandt"). Unfortunately there was a mistake in commit 100a573 ("ACPI: x86: s2idle: Move _HID handling for AMD systems into structures") that can lead to a NULL pointer dereference accessing `dev_id->driver_data` in the sentinel of `amd_hid_ids`. Fix this dereference. Reported-by: Richard Gong <[email protected]> Fixes: 100a573 ("ACPI: x86: s2idle: Move _HID handling for AMD systems into structures") Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 631b545 commit 39f8177

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/acpi/x86/s2idle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ static int lps0_device_attach(struct acpi_device *adev,
470470
for (dev_id = &amd_hid_ids[0]; dev_id->id[0]; dev_id++)
471471
if (acpi_dev_hid_uid_match(adev, dev_id->id, NULL))
472472
break;
473-
if (dev_id)
473+
if (dev_id->id[0])
474474
data = (const struct amd_lps0_hid_device_data *) dev_id->driver_data;
475475
else
476476
data = &amd_rembrandt;

0 commit comments

Comments
 (0)