mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Staging: quickstart: free after input_unregister_device()
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:
parent
5fb5d38fc2
commit
ebba26f4a8
1 changed files with 8 additions and 2 deletions
|
@ -355,7 +355,6 @@ static int quickstart_acpi_remove(struct acpi_device *device, int type)
|
|||
static void quickstart_exit(void)
|
||||
{
|
||||
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_buttons);
|
||||
|
@ -375,6 +374,7 @@ static int __init quickstart_init_input(void)
|
|||
{
|
||||
struct quickstart_btn **ptr = &quickstart_data.btn_lst;
|
||||
int count;
|
||||
int ret;
|
||||
|
||||
quickstart_input = input_allocate_device();
|
||||
|
||||
|
@ -391,7 +391,13 @@ static int __init quickstart_init_input(void)
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue