lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: quickstart: free after input_unregister_device()

Browse Source 
input_unregister_device() releases "quickstart_input" so the
input_free_device() is a double free.  Also I noticed that there is a
memory leak if the call to input_register_device() fails.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Dan Carpenter
2010-11-12 08:04:43 +03:00
committed by Greg Kroah-Hartman
parent 5fb5d38fc2
commit ebba26f4a8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/quickstart/quickstart.c
View File

@@ -355,7 +355,6 @@ static int quickstart_acpi_remove(struct acpi_device *device, int type)
static void quickstart_exit(void) static void quickstart_exit(void)
{ {
input_unregister_device(quickstart_input); input_unregister_device(quickstart_input);
input_free_device(quickstart_input);
device_remove_file(&pf_device->dev, &dev_attr_pressed_button); device_remove_file(&pf_device->dev, &dev_attr_pressed_button);
device_remove_file(&pf_device->dev, &dev_attr_buttons); device_remove_file(&pf_device->dev, &dev_attr_buttons);
@@ -375,6 +374,7 @@ static int __init quickstart_init_input(void)
{ {
struct quickstart_btn **ptr = &quickstart_data.btn_lst; struct quickstart_btn **ptr = &quickstart_data.btn_lst;
int count; int count;
int ret;
quickstart_input = input_allocate_device(); quickstart_input = input_allocate_device();
@@ -391,7 +391,13 @@ static int __init quickstart_init_input(void)
ptr = &((*ptr)->next); ptr = &((*ptr)->next);
} }
return input_register_device(quickstart_input); ret = input_register_device(quickstart_input);
if (ret) {
input_free_device(quickstart_input);
return ret;
}
return 0;
} }
static int __init quickstart_init(void) static int __init quickstart_init(void)