Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756394Ab2HHDnX (ORCPT ); Tue, 7 Aug 2012 23:43:23 -0400 Received: from mail-vc0-f174.google.com ([209.85.220.174]:48351 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756122Ab2HHDnU (ORCPT ); Tue, 7 Aug 2012 23:43:20 -0400 MIME-Version: 1.0 In-Reply-To: References: Date: Wed, 8 Aug 2012 09:13:19 +0530 Message-ID: Subject: Re: [PATCH] Input: omap4-keypad - don't leak in omap4_keypad_probe() From: Sachin Kamat To: Jesper Juhl Cc: Dmitry Torokhov , Sourav Poddar , Felipe Balbi , JJ Ding , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Abraham Arce , Syed Rafiuddin Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2004 Lines: 57 On 7 August 2012 23:46, Jesper Juhl wrote: > If omap4_keypad_parse_dt() does not return 0 (zero) in > omap4_keypad_probe() we will leak the memory we allocated for > 'keypad_data' with kzalloc() when we return and the variable goes out > of scope. How about using devm_kzalloc() instead which will take care of freeing the memory on detach? > Fix the leak by jumping to the 'err_free_keypad' label where we > properly free the allocated memory, instead of returning directly. > > Signed-off-by: Jesper Juhl > --- > drivers/input/keyboard/omap4-keypad.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Compile tested only. > > diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c > index c05f98c..9c2ac87 100644 > --- a/drivers/input/keyboard/omap4-keypad.c > +++ b/drivers/input/keyboard/omap4-keypad.c > @@ -281,7 +281,7 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev) > } else { > error = omap4_keypad_parse_dt(&pdev->dev, keypad_data); > if (error) > - return error; > + goto err_free_keypad; > } > > res = request_mem_region(res->start, resource_size(res), pdev->name); > -- > 1.7.11.4 > > > -- > Jesper Juhl http://www.chaosbits.net/ > Don't top-post http://www.catb.org/jargon/html/T/top-post.html > Plain text mails only, please. > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- Regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/