From: akpm@linux-foundation.org Subject: [patch 7/7] usbtouchscreen: fix leaks and check return value of usb_submit_urb() Date: Tue, 02 Feb 2010 14:42:57 -0800 Message-ID: <201002022242.o12Mgvev019151@imap1.linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:47788 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757099Ab0BBWnW (ORCPT ); Tue, 2 Feb 2010 17:43:22 -0500 Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: dtor@mail.ru Cc: linux-input@vger.kernel.org, akpm@linux-foundation.org, linux@rainbow-software.org, daniel.ritz@gmx.ch, ddstreet@ieee.org, dmitry.torokhov@gmail.com, floe@butterbrot.org, greg@kroah.com, jim-linux@nurd.se, oliver@neukum.org From: Ondrej Zary Fix urb and priv leaks in error paths of initialization and NEXIO ack_buf leak. Also check usb_submit_urb() return value. Signed-off-by: Ondrej Zary Cc: Dmitry Torokhov Cc: Jim Persson Cc: Florian Echtler Cc: Dan Streetman Cc: Daniel Ritz Cc: Greg KH Cc: Oliver Neukum Signed-off-by: Andrew Morton --- drivers/input/touchscreen/usbtouchscreen.c | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff -puN drivers/input/touchscreen/usbtouchscreen.c~usbtouchscreen-fix-leaks-and-check-return-value-of-usb_submit_urb drivers/input/touchscreen/usbtouchscreen.c --- a/drivers/input/touchscreen/usbtouchscreen.c~usbtouchscreen-fix-leaks-and-check-return-value-of-usb_submit_urb +++ a/drivers/input/touchscreen/usbtouchscreen.c @@ -834,6 +834,7 @@ static void nexio_exit(struct usbtouch_u usb_kill_urb(priv->ack); usb_free_urb(priv->ack); + kfree(priv->ack_buf); kfree(priv); } @@ -1395,23 +1396,35 @@ static int usbtouch_probe(struct usb_int err = type->init(usbtouch); if (err) { dbg("%s - type->init() failed, err: %d", __func__, err); - goto out_free_buffers; + goto out_free_urb; } } err = input_register_device(usbtouch->input); if (err) { dbg("%s - input_register_device failed, err: %d", __func__, err); - goto out_free_buffers; + goto out_exit; } usb_set_intfdata(intf, usbtouch); - if (usbtouch->type->irq_always) - usb_submit_urb(usbtouch->irq, GFP_KERNEL); + if (usbtouch->type->irq_always) { + err = usb_submit_urb(usbtouch->irq, GFP_KERNEL); + if (err) { + err("%s - usb_submit_urb failed with result: %d", + __func__, err); + input_unregister_device(usbtouch->input); + goto out_exit; + } + } return 0; +out_exit: + if (type->exit) + type->exit(usbtouch); +out_free_urb: + usb_free_urb(usbtouch->irq); out_free_buffers: usbtouch_free_buffers(udev, usbtouch); out_free: _