Skip to content

Commit ccd45fa

Browse files
nkiryushinrafaeljw
authored andcommitted
ACPI: video: check for error while searching for backlight device parent
If acpi_get_parent() called in acpi_video_dev_register_backlight() fails, for example, because acpi_ut_acquire_mutex() fails inside acpi_get_parent), this can lead to incorrect (uninitialized) acpi_parent handle being passed to acpi_get_pci_dev() for detecting the parent pci device. Check acpi_get_parent() result and set parent device only in case of success. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 9661e92 ("acpi: tie ACPI backlight devices to PCI devices if possible") Signed-off-by: Nikita Kiryushin <kiryushin@ancud.ru> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent c7add36 commit ccd45fa

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/acpi/acpi_video.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,12 +1717,12 @@ static void acpi_video_dev_register_backlight(struct acpi_video_device *device)
17171717
return;
17181718
count++;
17191719

1720-
acpi_get_parent(device->dev->handle, &acpi_parent);
1721-
1722-
pdev = acpi_get_pci_dev(acpi_parent);
1723-
if (pdev) {
1724-
parent = &pdev->dev;
1725-
pci_dev_put(pdev);
1720+
if (ACPI_SUCCESS(acpi_get_parent(device->dev->handle, &acpi_parent))) {
1721+
pdev = acpi_get_pci_dev(acpi_parent);
1722+
if (pdev) {
1723+
parent = &pdev->dev;
1724+
pci_dev_put(pdev);
1725+
}
17261726
}
17271727

17281728
memset(&props, 0, sizeof(struct backlight_properties));

0 commit comments

Comments
 (0)