Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'acpi-6.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"Fix a possible NULL pointer dereference in the error path of
acpi_video_bus_add() resulting from recent changes (Dinghao Liu)"
* tag 'acpi-6.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: video: Fix NULL pointer dereference in acpi_video_bus_add()
+5
-2
+5
-2
drivers/acpi/acpi_video.c
+5
-2
drivers/acpi/acpi_video.c
···
2057
2057
!auto_detect)
2058
2058
acpi_video_bus_register_backlight(video);
2059
2059
2060
-
acpi_video_bus_add_notify_handler(video);
2060
+
error = acpi_video_bus_add_notify_handler(video);
2061
+
if (error)
2062
+
goto err_del;
2061
2063
2062
2064
error = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
2063
2065
acpi_video_bus_notify);
···
2069
2067
return 0;
2070
2068
2071
2069
err_remove:
2070
+
acpi_video_bus_remove_notify_handler(video);
2071
+
err_del:
2072
2072
mutex_lock(&video_list_lock);
2073
2073
list_del(&video->entry);
2074
2074
mutex_unlock(&video_list_lock);
2075
-
acpi_video_bus_remove_notify_handler(video);
2076
2075
acpi_video_bus_unregister_backlight(video);
2077
2076
err_put_video:
2078
2077
acpi_video_bus_put_devices(video);