From patchwork Tue Dec 22 00:23:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 69209 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBM0NCS0025020 for ; Tue, 22 Dec 2009 00:23:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752428AbZLVAXn (ORCPT ); Mon, 21 Dec 2009 19:23:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752454AbZLVAXn (ORCPT ); Mon, 21 Dec 2009 19:23:43 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:35060 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752446AbZLVAXm (ORCPT ); Mon, 21 Dec 2009 19:23:42 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id nBM0N6Kp005530 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 21 Dec 2009 16:23:07 -0800 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id nBM0N69n005064; Mon, 21 Dec 2009 16:23:06 -0800 Message-Id: <200912220023.nBM0N69n005064@imap1.linux-foundation.org> Subject: [patch 8/8] usbtouchscreen: fix leaks and check return value of usb_submit_urb() 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: akpm@linux-foundation.org Date: Mon, 21 Dec 2009 16:23:06 -0800 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.515 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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: