linux-kernel - Re: [PATCH] input: da9052: fix mem leak in da9052_onkey

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20120411212244.GB27562@core.coreip.homeip.net>
Date:	Wed, 11 Apr 2012 14:22:44 -0700
From:	Dmitry Torokhov <dmitry.torokhov@...il.com>
To:	Jesper Juhl <jj@...osbits.net>
Cc:	linux-kernel@...r.kernel.org, David Dajun Chen <dchen@...semi.com>,
	linux-input@...r.kernel.org,
	Ashish Jangam <ashish.jangam@...tcummins.com>
Subject: Re: [PATCH] input: da9052: fix mem leak in da9052_onkey_probe()

On Wed, Apr 11, 2012 at 10:56:10PM +0200, Jesper Juhl wrote:
> 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@...osbits.net>

I must have messed up error hanlding path when collapsing the 2 memory
allocations; applied, thank Jesper.

> ---
>  drivers/input/misc/da9052_onkey.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
> index 34aebb8..3c843cd 100644
> --- a/drivers/input/misc/da9052_onkey.c
> +++ b/drivers/input/misc/da9052_onkey.c
> @@ -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;
> -- 
> 1.7.10
> 
> 
> -- 
> Jesper Juhl <jj@...osbits.net>       http://www.chaosbits.net/
> Don't top-post http://www.catb.org/jargon/html/T/top-post.html
> Plain text mails only, please.
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/