From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757988Ab3LGLnD (ORCPT ); Sat, 7 Dec 2013 06:43:03 -0500 Received: from mo-p00-ob.rzone.de ([81.169.146.161]:56173 "EHLO mo-p00-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754955Ab3LGLm7 (ORCPT ); Sat, 7 Dec 2013 06:42:59 -0500 X-RZG-AUTH: :P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrT1q0ngWNsKR9Dbc7nsXB+5kzEuKuQfw== X-RZG-CLASS-ID: mo00 Message-ID: <52A309BE.7000602@hartkopp.net> Date: Sat, 07 Dec 2013 12:42:54 +0100 From: Oliver Hartkopp User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20131103 Icedove/17.0.10 MIME-Version: 1.0 To: Alexey Khoroshilov , Sebastian Haas CC: Wolfgang Grandegger , Marc Kleine-Budde , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: Re: [PATCH] can: ems_usb: fix urb leaks on failure paths References: <1386371435-17597-1-git-send-email-khoroshilov@ispras.ru> In-Reply-To: <1386371435-17597-1-git-send-email-khoroshilov@ispras.ru> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello Alexey, looks better :-) I added the author of this driver to double check the patch and for his Acked-by ... @Sebastian: Would you like to update your e-mail address too? Best regards, Oliver On 07.12.2013 00:10, Alexey Khoroshilov wrote: > There are a couple failure paths where urb leaks. > Is spare code within ems_usb_start_xmit(), > usb_free_urb() should be used to deallocate urb instead of usb_unanchor_urb(). > In ems_usb_start() there is no usb_free_urb() if usb_submit_urb() fails. > > Found by Linux Driver Verification project (linuxtesting.org). > > Signed-off-by: Alexey Khoroshilov > --- > drivers/net/can/usb/ems_usb.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c > index 5f9a7ad9b964..8aeec0b4601a 100644 > --- a/drivers/net/can/usb/ems_usb.c > +++ b/drivers/net/can/usb/ems_usb.c > @@ -625,6 +625,7 @@ static int ems_usb_start(struct ems_usb *dev) > usb_unanchor_urb(urb); > usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf, > urb->transfer_dma); > + usb_free_urb(urb); > break; > } > > @@ -798,8 +799,8 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne > * allowed (MAX_TX_URBS). > */ > if (!context) { > - usb_unanchor_urb(urb); > usb_free_coherent(dev->udev, size, buf, urb->transfer_dma); > + usb_free_urb(urb); > > netdev_warn(netdev, "couldn't find free context\n"); > >