* [patch] ACPI video: use after input_unregister_device()
@ 2012-04-04 11:19 Dan Carpenter
2012-04-04 16:19 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2012-04-04 11:19 UTC (permalink / raw)
To: Zhang Rui; +Cc: Len Brown, linux-acpi, Dmitry Torokhov, kernel-janitors
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: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 9577b6f..51aba50a 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1687,10 +1687,6 @@ static int acpi_video_bus_add(struct acpi_device *device)
set_bit(KEY_BRIGHTNESS_ZERO, 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",
ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
video->flags.multihead ? "yes" : "no",
@@ -1701,12 +1697,16 @@ static int acpi_video_bus_add(struct acpi_device *device)
video->pm_nb.priority = 0;
error = register_pm_notifier(&video->pm_nb);
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;
- err_unregister_input_dev:
- input_unregister_device(input);
+ err_unregister_pm_notifier:
+ unregister_pm_notifier(&video->pm_nb);
err_stop_video:
acpi_video_bus_stop_devices(video);
err_free_input_dev:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch] ACPI video: use after input_unregister_device()
2012-04-04 11:19 [patch] ACPI video: use after input_unregister_device() Dan Carpenter
@ 2012-04-04 16:19 ` Dmitry Torokhov
2012-06-01 17:42 ` Len Brown
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Torokhov @ 2012-04-04 16:19 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Zhang Rui, Len Brown, linux-acpi, kernel-janitors
On Wed, Apr 04, 2012 at 02:19:16PM +0300, Dan Carpenter wrote:
> 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: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
>
> diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
> index 9577b6f..51aba50a 100644
> --- a/drivers/acpi/video.c
> +++ b/drivers/acpi/video.c
> @@ -1687,10 +1687,6 @@ static int acpi_video_bus_add(struct acpi_device *device)
> set_bit(KEY_BRIGHTNESS_ZERO, 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",
> ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
> video->flags.multihead ? "yes" : "no",
> @@ -1701,12 +1697,16 @@ static int acpi_video_bus_add(struct acpi_device *device)
> video->pm_nb.priority = 0;
> error = register_pm_notifier(&video->pm_nb);
> 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;
>
> - err_unregister_input_dev:
> - input_unregister_device(input);
> + err_unregister_pm_notifier:
> + unregister_pm_notifier(&video->pm_nb);
> err_stop_video:
> acpi_video_bus_stop_devices(video);
> err_free_input_dev:
>
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-06-01 17:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-04 11:19 [patch] ACPI video: use after input_unregister_device() Dan Carpenter
2012-04-04 16:19 ` Dmitry Torokhov
2012-06-01 17:42 ` Len Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox