OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: rtl8712: redundant null check before kfree() 

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alexander Beregalov 2011-03-26 20:18:14 +03:00 committed by Greg Kroah-Hartman
parent cc614b6970
commit 4008386593
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/rtl8712/rtl871x_cmd.c
View File

@ -431,8 +431,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
}
psecnetwork = (struct ndis_wlan_bssid_ex *)&psecuritypriv->sec_bss;
if (psecnetwork == NULL) {
if (pcmd != NULL)
kfree((unsigned char *)pcmd);
kfree(pcmd);
return _FAIL;
}
memset(psecnetwork, 0, t_len);

6
drivers/staging/rtl8712/rtl871x_io.c
View File

@ -73,8 +73,7 @@ static uint _init_intf_hdl(struct _adapter *padapter,
goto _init_intf_hdl_fail;
return _SUCCESS;
_init_intf_hdl_fail:
if (pintf_priv)
kfree((u8 *)pintf_priv);
kfree(pintf_priv);
return _FAIL;
}
@ -84,8 +83,7 @@ static void _unload_intf_hdl(struct intf_priv *pintfpriv)
unload_intf_priv = &r8712_usb_unload_intf_priv;
unload_intf_priv(pintfpriv);
if (pintfpriv)
kfree((u8 *)pintfpriv);
kfree(pintfpriv);
}
static uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl)

3
drivers/staging/rtl8712/rtl871x_ioctl_linux.c
View File

@ -1732,8 +1732,7 @@ static int r871x_wx_set_enc_ext(struct net_device *dev,
memcpy(param + 1, pext + 1, pext->key_len);
}
ret = wpa_set_encryption(dev, param, param_len);
if (param)
kfree((u8 *)param);
kfree(param);
return ret;
}

3
drivers/staging/rtl8712/rtl871x_mp.c
View File

@ -274,8 +274,7 @@ void r8712_SetChannel(struct _adapter *pAdapter)
pparm = (struct SetChannel_parm *)_malloc(sizeof(struct
SetChannel_parm));
if (pparm == NULL) {
if (pcmd != NULL)
kfree((u8 *)pcmd);
kfree(pcmd);
return;
}
pparm->curr_ch = pAdapter->mppriv.curr_ch;

3
drivers/staging/rtl8712/rtl871x_xmit.c
View File

@ -996,8 +996,7 @@ static void free_hwxmits(struct _adapter *padapter)
{
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
if (pxmitpriv->hwxmits)
kfree((u8 *)pxmitpriv->hwxmits);
kfree(pxmitpriv->hwxmits);
}
static void init_hwxmits(struct hw_xmit *phwxmit, sint entry)