Commit 830380e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 1c9d8312 f4dcf06b

drivers/acpi/acpi_video.c

+5 −2
Original line number Diff line number Diff line
@@ -2057,7 +2057,9 @@ static int acpi_video_bus_add(struct acpi_device *device) 
	    !auto_detect)

		acpi_video_bus_register_backlight(video);



	acpi_video_bus_add_notify_handler(video);

	error = acpi_video_bus_add_notify_handler(video);

	if (error)

		goto err_del;



	error = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,

						acpi_video_bus_notify);
@@ -2067,10 +2069,11 @@ static int acpi_video_bus_add(struct acpi_device *device) 
	return 0;



err_remove:

	acpi_video_bus_remove_notify_handler(video);

err_del:

	mutex_lock(&video_list_lock);

	list_del(&video->entry);

	mutex_unlock(&video_list_lock);

	acpi_video_bus_remove_notify_handler(video);

	acpi_video_bus_unregister_backlight(video);

err_put_video:

	acpi_video_bus_put_devices(video);