From patchwork Thu Feb 10 20:58:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 82667 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E3E1EB7120 for ; Fri, 11 Feb 2011 08:00:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757000Ab1BJU75 (ORCPT ); Thu, 10 Feb 2011 15:59:57 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:26802 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756878Ab1BJU7z (ORCPT ); Thu, 10 Feb 2011 15:59:55 -0500 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id E31809403D; Thu, 10 Feb 2011 21:58:45 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id E0B4C9403B; Thu, 10 Feb 2011 21:58:45 +0100 (CET) Date: Thu, 10 Feb 2011 21:58:45 +0100 (CET) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, Greg Kroah-Hartman , David Brownell , David Hollis Subject: [PATCH] USB Network driver infrastructure: Fix leak when usb_autopm_get_interface() returns less than zero in kevent(). Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We'll leak the memory allocated to 'urb' in drivers/net/usb/usbnet.c:kevent() when we 'goto fail_lowmem' and the 'urb' variable goes out of scope while still completely unused. Signed-off-by: Jesper Juhl --- usbnet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) compile tested only. diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index ed9a416..95c41d5 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -931,8 +931,10 @@ fail_halt: if (urb != NULL) { clear_bit (EVENT_RX_MEMORY, &dev->flags); status = usb_autopm_get_interface(dev->intf); - if (status < 0) + if (status < 0) { + usb_free_urb(urb); goto fail_lowmem; + } if (rx_submit (dev, urb, GFP_KERNEL) == -ENOLINK) resched = 0; usb_autopm_put_interface(dev->intf);