Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd4fcdad authored by Souptick Joarder's avatar Souptick Joarder Committed by Greg Kroah-Hartman
Browse files

staging : rtl8712: Free memory when kmalloc fails 



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: default avatarSouptick joarder <jrdr.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ecf034b

drivers/staging/rtl8712/rtl871x_cmd.c

+4 −1
Original line number Diff line number Diff line
@@ -72,8 +72,11 @@ 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;

drivers/staging/rtl8712/rtl871x_xmit.c

+4 −1
Original line number Diff line number Diff line
@@ -128,8 +128,11 @@ 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;