linux-kernel - Re: [PATCH v2] staging: rtl8192u: add error handling for usb_alloc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 15 Jun 2018 18:33:22 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Zhouyang Jia <jiazhouyang09@...il.com>
Cc:     devel@...verdev.osuosl.org, Kees Cook <keescook@...omium.org>,
        linux-kernel@...r.kernel.org, Jia-Ju Bai <baijiaju1990@...il.com>,
        Christophe JAILLET <christophe.jaillet@...adoo.fr>,
        Shreeya Patel <shreeya.patel23498@...il.com>,
        Colin Ian King <colin.king@...onical.com>
Subject: Re: [PATCH v2] staging: rtl8192u: add error handling for
 usb_alloc_urb

On Sat, Jun 16, 2018 at 12:25:23AM +0800, Zhouyang Jia wrote:
> When usb_alloc_urb fails, the lack of error-handling code may
> cause unexpected results.
> 
> This patch adds error-handling code after calling usb_alloc_urb.
> 
> Signed-off-by: Zhouyang Jia <jiazhouyang09@...il.com>
> ---
> v1->v2:
> - Fix memory leak.
> ---
>  drivers/staging/rtl8192u/r8192U_core.c | 18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
> index 7a0dbc0..6afab4e 100644
> --- a/drivers/staging/rtl8192u/r8192U_core.c
> +++ b/drivers/staging/rtl8192u/r8192U_core.c
> @@ -1648,13 +1648,17 @@ static short rtl8192_usb_initendpoints(struct net_device *dev)
>  #ifndef JACKSON_NEW_RX
>  	for (i = 0; i < (MAX_RX_URB + 1); i++) {
>  		priv->rx_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
> -		if (!priv->rx_urb[i])
> +		if (!priv->rx_urb[i]) {
> +			kfree(priv->rx_urb);
>  			return -ENOMEM;
> +		}

{sigh}

No, you are still leaking memory on all of these changes that you just
made :(

greg k-h