redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Input: da9052 - fix memory leak in da9052_onkey_probe() 

If, in drivers/input/misc/da9052_onkey.c::da9052_onkey_probe(), the
call to either kzalloc() or input_allocate_device() fails then we will
return -ENOMEM from the function without freeing the other allocation
that may have succeeded, thus we leak either the memory allocated for
'onkey' or the memory allocated for 'input_dev' if one succeeds and
the other fails.
Fix that by jumping to the 'err_free_mem' label at the end of the
function that properly cleans up rather than returning directly.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
hifive-unleashed-5.1
Jesper Juhl 2012-04-11 20:55:18 -07:00 committed by Dmitry Torokhov
parent 55158c886a
commit 0e3d0f3d96
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/misc/da9052_onkey.c
View File

@ -95,7 +95,8 @@ static int __devinit da9052_onkey_probe(struct platform_device *pdev)
input_dev = input_allocate_device();
if (!onkey || !input_dev) {
dev_err(&pdev->dev, "Failed to allocate memory\n");
return -ENOMEM;
error = -ENOMEM;
goto err_free_mem;
}
onkey->input = input_dev;