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  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:	Mon, 16 Jun 2014 08:26:10 -0500
From:	Steve Wise <swise@...ngridcomputing.com>
To:	Nick <xerofoify@...il.com>, swise@...lsio.com
CC:	roland@...nel.org, sean.hefty@...el.com, hal.rosenstock@...il.com,
	linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Fix memory leak in cm.c

On 6/15/2014 9:26 PM, Nick wrote:
> This patch fixes memory by checking in function,
> *get_skuff if it is be passing a Null skb
> struct.
> Cheers Nick
> Signed-off-by: Nick <xerofoify@...il.com>
> ---
>   drivers/infiniband/hw/cxgb4/cm.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
> index 5e153f6..f9477e2 100644
> --- a/drivers/infiniband/hw/cxgb4/cm.c
> +++ b/drivers/infiniband/hw/cxgb4/cm.c
> @@ -340,7 +340,11 @@ static int status2errno(int status)
>    */
>   static struct sk_buff *get_skb(struct sk_buff *skb, int len, gfp_t gfp)
>   {
> -	if (skb && !skb_is_nonlinear(skb) && !skb_cloned(skb)) {
> +	if (!skb) {
> +		return NULL;
> +	}
> +
> +	else if (skb && !skb_is_nonlinear(skb) && !skb_cloned(skb)) {
>   		skb_trim(skb, 0);
>   		skb_get(skb);
>   		skb_reset_transport_header(skb);

This patch is incorrect.  If skb is null, then get_skb() will allocate a 
new one.  The idea is to reuse skb if it can be reused (ie is linear and 
not cloned). Otherwise allocate a new one:

static struct sk_buff *get_skb(struct sk_buff *skb, int len, gfp_t gfp)
{
         if (skb && !skb_is_nonlinear(skb) && !skb_cloned(skb)) {
                 skb_trim(skb, 0);
                 skb_get(skb);
                 skb_reset_transport_header(skb);
         } else {
                 skb = alloc_skb(len, gfp);
         }
         t4_set_arp_err_handler(skb, NULL, NULL);
         return skb;
}


However, if skb is not null and (is not linear or is cloned), then we 
leak the skb.  So there is a bug.

So the else clause should free skb if it not NULL before calling 
alloc_skb() to get a new one.

Steve.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists