From patchwork Tue Aug 7 21:56:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 175809 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 615622C0095 for ; Wed, 8 Aug 2012 07:56:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756869Ab2HGV43 (ORCPT ); Tue, 7 Aug 2012 17:56:29 -0400 Received: from 1010ds2-suoe.0.fullrate.dk ([90.184.90.115]:18935 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752353Ab2HGV42 (ORCPT ); Tue, 7 Aug 2012 17:56:28 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id D17479403E; Tue, 7 Aug 2012 23:56:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id CA88F9403B; Tue, 7 Aug 2012 23:56:26 +0200 (CEST) Date: Tue, 7 Aug 2012 23:56:26 +0200 (CEST) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org, Greg Kroah-Hartman , =?ISO-8859-15?Q?R=E9mi_Denis-Courmont?= , Remi Denis-Courmont Subject: [PATCH] cdc-phonet: Don't leak in usbpn_open 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 allocate memory for 'req' with usb_alloc_urb() and then test 'if (!req || rx_submit(pnd, req, GFP_KERNEL | __GFP_COLD))'. If we enter that branch due to '!req' then there is no problem. But if we enter the branch due to 'req' being != 0 and the 'rx_submit()' call being false, then we'll leak the memory we allocated. Deal with the leak by always calling 'usb_free_urb(req)' when entering the branch. If 'req' happens to be 0 then the call is harmless, if it is not 0 then we free the memory we allocated but don't need. Signed-off-by: Jesper Juhl Acked-by: Rémi Denis-Courmont --- drivers/net/usb/cdc-phonet.c | 1 + 1 file changed, 1 insertion(+) Only compile tested due to lack of hardware. diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c index 6461004..7d78669 100644 --- a/drivers/net/usb/cdc-phonet.c +++ b/drivers/net/usb/cdc-phonet.c @@ -232,6 +232,7 @@ static int usbpn_open(struct net_device *dev) struct urb *req = usb_alloc_urb(0, GFP_KERNEL); if (!req || rx_submit(pnd, req, GFP_KERNEL | __GFP_COLD)) { + usb_free_urb(req); usbpn_close(dev); return -ENOMEM; }