Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 301f33fb authored by Dan Carpenter's avatar Dan Carpenter Committed by Len Brown
Browse files

ACPI video: use after input_unregister_device() 



We can't use "input" anymore after calling input_unregister_device().
The call to input_free_device() is a double free.  The normal way to
deal with this is to make input_register_device() the last function
called in the function.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 155689de

drivers/acpi/video.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -1687,10 +1687,6 @@ static int acpi_video_bus_add(struct acpi_device *device) 
	set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);

	set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);

	set_bit(KEY_DISPLAY_OFF, input->keybit);

	set_bit(KEY_DISPLAY_OFF, input->keybit);





	error = input_register_device(input);

	if (error)

		goto err_stop_video;



	printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",

	printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",

	       ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),

	       ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),

	       video->flags.multihead ? "yes" : "no",

	       video->flags.multihead ? "yes" : "no",
@@ -1701,12 +1697,16 @@ static int acpi_video_bus_add(struct acpi_device *device) 
	video->pm_nb.priority = 0;

	video->pm_nb.priority = 0;

	error = register_pm_notifier(&video->pm_nb);

	error = register_pm_notifier(&video->pm_nb);

	if (error)

	if (error)

		goto err_unregister_input_dev;

		goto err_stop_video;



	error = input_register_device(input);

	if (error)

		goto err_unregister_pm_notifier;





	return 0;

	return 0;





 err_unregister_input_dev:

 err_unregister_pm_notifier:

	input_unregister_device(input);

	unregister_pm_notifier(&video->pm_nb);

 err_stop_video:

 err_stop_video:

	acpi_video_bus_stop_devices(video);

	acpi_video_bus_stop_devices(video);

 err_free_input_dev:

 err_free_input_dev: