2022-04-01 02:48:19

by Xiaoke Wang

Subject: [PATCH 3/3] staging: rtl8712: fix potential memory leak in r8712_init_drv_sw()

From: Xiaoke Wang <[email protected]>

In r8712_init_drv_sw(), all the error paths do not properly release the
resources allocated by its callees.
This patch is to free them.

Signed-off-by: Xiaoke Wang <[email protected]>
---
drivers/staging/rtl8712/os_intfs.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index 163baaa..28b1684 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -304,23 +304,23 @@ int r8712_init_drv_sw(struct _adapter *padapter)
padapter->cmdpriv.padapter = padapter;
ret = r8712_init_evt_priv(&padapter->evtpriv);
if (ret)
- return ret;
+ goto free_cmd_priv;
ret = r8712_init_mlme_priv(padapter);
if (ret)
- return ret;
+ goto free_evt_priv;
ret = _r8712_init_xmit_priv(&padapter->xmitpriv, padapter);
if (ret)
- return ret;
+ goto free_mlme_priv;
ret = _r8712_init_recv_priv(&padapter->recvpriv, padapter);
if (ret)
- return ret;
+ goto free_xmit_priv;
memset((unsigned char *)&padapter->securitypriv, 0,
sizeof(struct security_priv));
timer_setup(&padapter->securitypriv.tkip_timer,
r8712_use_tkipkey_handler, 0);
ret = _r8712_init_sta_priv(&padapter->stapriv);
if (ret)
- return ret;
+ goto free_recv_priv;
padapter->stapriv.padapter = padapter;
r8712_init_bcmc_stainfo(padapter);
r8712_init_pwrctrl_priv(padapter);
@@ -328,6 +328,18 @@ int r8712_init_drv_sw(struct _adapter *padapter)
init_default_value(padapter);
r8712_InitSwLeds(padapter);
return ret;
+
+free_recv_priv:
+ _r8712_free_recv_priv(&padapter->recvpriv);
+free_xmit_priv:
+ _free_xmit_priv(&padapter->xmitpriv);
+free_mlme_priv:
+ r8712_free_mlme_priv(&padapter->mlmepriv);
+free_evt_priv:
+ r8712_free_evt_priv(&padapter->evtpriv);
+free_cmd_priv:
+ r8712_free_cmd_priv(&padapter->cmdpriv);
+ return ret;
}

void r8712_free_drv_sw(struct _adapter *padapter)
--

2022-04-02 17:05:45

by Dan Carpenter

Subject: Re: [PATCH 3/3] staging: rtl8712: fix potential memory leak in r8712_init_drv_sw()

On Fri, Apr 01, 2022 at 01:08:19AM +0800, [email protected] wrote:
> ret = _r8712_init_sta_priv(&padapter->stapriv);
> if (ret)
> - return ret;
> + goto free_recv_priv;
> padapter->stapriv.padapter = padapter;
> r8712_init_bcmc_stainfo(padapter);
> r8712_init_pwrctrl_priv(padapter);
> @@ -328,6 +328,18 @@ int r8712_init_drv_sw(struct _adapter *padapter)
> init_default_value(padapter);
> r8712_InitSwLeds(padapter);
> return ret;

Not related to the patch. (You didn't introduce this, so it's not
something you need to fix.) But this "return ret;" would be better if
it were "return 0;"

regards,
dan carpenter


> +
> +free_recv_priv:
> + _r8712_free_recv_priv(&padapter->recvpriv);
> +free_xmit_priv:
> + _free_xmit_priv(&padapter->xmitpriv);
> +free_mlme_priv:
> + r8712_free_mlme_priv(&padapter->mlmepriv);
> +free_evt_priv:
> + r8712_free_evt_priv(&padapter->evtpriv);
> +free_cmd_priv:
> + r8712_free_cmd_priv(&padapter->cmdpriv);
> + return ret;
> }