From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760895AbZJIOLJ (ORCPT ); Fri, 9 Oct 2009 10:11:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757072AbZJIOLI (ORCPT ); Fri, 9 Oct 2009 10:11:08 -0400 Received: from server1.wserver.cz ([82.113.45.157]:45521 "EHLO server1.wserver.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754762AbZJIOLG (ORCPT ); Fri, 9 Oct 2009 10:11:06 -0400 From: Jiri Slaby To: gregkh@suse.de Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH -repost 1/1] USB: usblcd, fix memory leak Date: Fri, 9 Oct 2009 16:10:28 +0200 Message-Id: <1255097428-24250-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.4.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stanse found a memory leak in lcd_probe. Instead of returning without releasing the memory, jump to the error label which frees it. http://stanse.fi.muni.cz/ Signed-off-by: Jiri Slaby Cc: Greg Kroah-Hartman --- drivers/usb/misc/usblcd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c index 29092b8..4fb1203 100644 --- a/drivers/usb/misc/usblcd.c +++ b/drivers/usb/misc/usblcd.c @@ -313,7 +313,8 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id if (le16_to_cpu(dev->udev->descriptor.idProduct) != 0x0001) { dev_warn(&interface->dev, "USBLCD model not supported.\n"); - return -ENODEV; + retval = -ENODEV; + goto error; } /* set up the endpoint information */ -- 1.6.4.2