Re: [PATCH v3] staging : rtl8712: Free memory when kmalloc fails

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Oct 28, 2016 at 10:37:53AM +0530, Souptick Joarder wrote:
> There are few functions where we need to free previously allocated memory
> when kmalloc fails. Else it may lead to memory leakage. In  _init_cmd_priv()
> and _r8712_init_xmit_priv(), in few places we are not freeing previously
> allocated memory when kmalloc fails.
> 
> Signed-off-by: Souptick joarder <jrdr.linux@xxxxxxxxx>
> ---
> v2:
>   - Make the commit message more descriptive
> v3:
>   - Modified the patch description by adding space in required places
> 
>  drivers/staging/rtl8712/rtl871x_cmd.c  | 4 +++-
>  drivers/staging/rtl8712/rtl871x_xmit.c | 4 +++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
> index b7ee5e6..1f284ae 100644
> --- a/drivers/staging/rtl8712/rtl871x_cmd.c
> +++ b/drivers/staging/rtl8712/rtl871x_cmd.c
> @@ -72,8 +72,10 @@ static sint _init_cmd_priv(struct cmd_priv *pcmdpriv)
>  			    ((addr_t)(pcmdpriv->cmd_allocated_buf) &
>  			    (CMDBUFF_ALIGN_SZ - 1));
>  	pcmdpriv->rsp_allocated_buf = kmalloc(MAX_RSPSZ + 4, GFP_ATOMIC);
> -	if (!pcmdpriv->rsp_allocated_buf)
> +	if (!pcmdpriv->rsp_allocated_buf) {
> +		kfree(pcmdpriv->cmd_allocated_buf);
> +		pcmdpriv->cmd_allocated_buf = NULL;
>  		return _FAIL;
> +	}
>  	pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf  +  4 -
>  			    ((addr_t)(pcmdpriv->rsp_allocated_buf) & 3);
>  	pcmdpriv->cmd_issued_cnt = 0;
> diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
> index be38364..f335161 100644
> --- a/drivers/staging/rtl8712/rtl871x_xmit.c
> +++ b/drivers/staging/rtl8712/rtl871x_xmit.c
> @@ -128,8 +128,10 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
>  	_init_queue(&pxmitpriv->pending_xmitbuf_queue);
>  	pxmitpriv->pallocated_xmitbuf = kmalloc(NR_XMITBUFF * sizeof(struct xmit_buf) + 4,
>  						GFP_ATOMIC);
> -	if (!pxmitpriv->pallocated_xmitbuf)
> +	if (!pxmitpriv->pallocated_xmitbuf) {
> +		kfree(pxmitpriv->pallocated_frame_buf);
> +		pxmitpriv->pallocated_frame_buf = NULL;
>  		return _FAIL;
> +	}
>  	pxmitpriv->pxmitbuf = pxmitpriv->pallocated_xmitbuf + 4 -
>  			      ((addr_t)(pxmitpriv->pallocated_xmitbuf) & 3);
>  	pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
> -- 
> 1.9.1

This patch is totally corrupted, how did you generate it?
You can't hand-edit a patch file, unless you know how to do it...

Please fix up and resend in a format I can apply it in.

thanks,

greg k-h
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel



[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux