| Message ID | 20161020065932.GA21705@symbol-HP-ZBook-15 (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Thu, Oct 20, 2016 at 12:29:33PM +0530, Souptick Joarder wrote: > This patch is added to free memory and return failure when kmalloc fails I'm sorry, but I can not parse that sentance. Can you rephrase this a bit better? What exactly are you doing here? > > Signed-off-by: Souptick joarder <jrdr.linux@gmail.com> > --- > drivers/staging/rtl8712/os_intfs.c | 3 ++- > drivers/staging/rtl8712/rtl871x_cmd.c | 5 ++++- > drivers/staging/rtl8712/rtl871x_xmit.c | 5 ++++- > 3 files changed, 10 insertions(+), 3 deletions(-) Any reason why you didn't cc: the driverdevel mailing list? I doubt linux-wireless cares about staging drivers :( > > diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c > index cbe4de0..aab3141 100644 > --- a/drivers/staging/rtl8712/os_intfs.c > +++ b/drivers/staging/rtl8712/os_intfs.c > @@ -313,7 +313,8 @@ u8 r8712_init_drv_sw(struct _adapter *padapter) > return _FAIL; > if (r8712_init_mlme_priv(padapter) == _FAIL) > return _FAIL; > - _r8712_init_xmit_priv(&padapter->xmitpriv, padapter); > + if ((_r8712_init_xmit_priv(&padapter->xmitpriv, padapter)) != _SUCCESS) > + return _FAIL; You don't have to unwind anything that r8712_init_mlme_priv() did? > _r8712_init_recv_priv(&padapter->recvpriv, padapter); > memset((unsigned char *)&padapter->securitypriv, 0, > sizeof(struct security_priv)); thanks, greg k-h
diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c index cbe4de0..aab3141 100644 --- a/drivers/staging/rtl8712/os_intfs.c +++ b/drivers/staging/rtl8712/os_intfs.c @@ -313,7 +313,8 @@ u8 r8712_init_drv_sw(struct _adapter *padapter) return _FAIL; if (r8712_init_mlme_priv(padapter) == _FAIL) return _FAIL; - _r8712_init_xmit_priv(&padapter->xmitpriv, padapter); + if ((_r8712_init_xmit_priv(&padapter->xmitpriv, padapter)) != _SUCCESS) + return _FAIL; _r8712_init_recv_priv(&padapter->recvpriv, padapter); memset((unsigned char *)&padapter->securitypriv, 0, sizeof(struct security_priv)); diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index b7ee5e6..04638f1 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -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; diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c index be38364..484d2f2 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.c +++ b/drivers/staging/rtl8712/rtl871x_xmit.c @@ -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;
This patch is added to free memory and return failure when kmalloc fails Signed-off-by: Souptick joarder <jrdr.linux@gmail.com> --- drivers/staging/rtl8712/os_intfs.c | 3 ++- drivers/staging/rtl8712/rtl871x_cmd.c | 5 ++++- drivers/staging/rtl8712/rtl871x_xmit.c | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-)