korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8192u: Remove NULL check before kfree

Browse Source 
This patch was generated by the following semantic patch:
// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);

@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ilia Mirkin 2011-03-13 00:29:07 -05:00 committed by Greg Kroah-Hartman
parent 7e901dcd73
commit e72714fb20
6 changed files with 19 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/rtl8192u/ieee80211/cipher.c
View File

@ -294,6 +294,5 @@ out:
void crypto_exit_cipher_ops(struct crypto_tfm *tfm) void crypto_exit_cipher_ops(struct crypto_tfm *tfm)
{ {
if (tfm->crt_cipher.cit_iv) kfree(tfm->crt_cipher.cit_iv);
kfree(tfm->crt_cipher.cit_iv);
} }

7
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
View File

@ -198,11 +198,8 @@ void free_ieee80211(struct net_device *dev)
int i; int i;
//struct list_head *p, *q; //struct list_head *p, *q;
// del_timer_sync(&ieee->SwBwTimer); // del_timer_sync(&ieee->SwBwTimer);
if (ieee->pHTInfo != NULL) kfree(ieee->pHTInfo);
{ ieee->pHTInfo = NULL;
kfree(ieee->pHTInfo);
ieee->pHTInfo = NULL;
}
RemoveAllTS(ieee); RemoveAllTS(ieee);
ieee80211_softmac_free(ieee); ieee80211_softmac_free(ieee);
del_timer_sync(&ieee->crypt_deinit_timer); del_timer_sync(&ieee->crypt_deinit_timer);

7
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
View File

@ -1384,11 +1384,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
return 1; return 1;
rx_dropped: rx_dropped:
if (rxb != NULL) kfree(rxb);
{ rxb = NULL;
kfree(rxb);
rxb = NULL;
}
stats->rx_dropped++; stats->rx_dropped++;
/* Returning 0 indicates to caller that we have not handled the SKB-- /* Returning 0 indicates to caller that we have not handled the SKB--

7
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
View File

@ -2755,11 +2755,8 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
void ieee80211_softmac_free(struct ieee80211_device *ieee) void ieee80211_softmac_free(struct ieee80211_device *ieee)
{ {
down(&ieee->wx_sem); down(&ieee->wx_sem);
if(NULL != ieee->pDot11dInfo) kfree(ieee->pDot11dInfo);
{ ieee->pDot11dInfo = NULL;
kfree(ieee->pDot11dInfo);
ieee->pDot11dInfo = NULL;
}
del_timer_sync(&ieee->associate_timer); del_timer_sync(&ieee->associate_timer);
cancel_delayed_work(&ieee->associate_retry_wq); cancel_delayed_work(&ieee->associate_retry_wq);

1
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
View File

@ -855,7 +855,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
ieee->wpa_ie_len = len; ieee->wpa_ie_len = len;
} }
else{ else{
if (ieee->wpa_ie)
kfree(ieee->wpa_ie); kfree(ieee->wpa_ie);
ieee->wpa_ie = NULL; ieee->wpa_ie = NULL;
ieee->wpa_ie_len = 0; ieee->wpa_ie_len = 0;

39
drivers/staging/rtl8192u/r8192U_core.c
View File

@ -2242,12 +2242,8 @@ short rtl8192_usb_initendpoints(struct net_device *dev)
destroy: destroy:
if (priv->pp_rxskb) { kfree(priv->pp_rxskb);
kfree(priv->pp_rxskb); kfree(priv->rx_urb);
}
if (priv->rx_urb) {
kfree(priv->rx_urb);
}
priv->pp_rxskb = NULL; priv->pp_rxskb = NULL;
priv->rx_urb = NULL; priv->rx_urb = NULL;
@ -2276,10 +2272,8 @@ void rtl8192_usb_deleteendpoints(struct net_device *dev)
kfree(priv->rx_urb); kfree(priv->rx_urb);
priv->rx_urb = NULL; priv->rx_urb = NULL;
} }
if(priv->oldaddr){ kfree(priv->oldaddr);
kfree(priv->oldaddr); priv->oldaddr = NULL;
priv->oldaddr = NULL;
}
if (priv->pp_rxskb) { if (priv->pp_rxskb) {
kfree(priv->pp_rxskb); kfree(priv->pp_rxskb);
priv->pp_rxskb = 0; priv->pp_rxskb = 0;
@ -2304,14 +2298,10 @@ void rtl8192_usb_deleteendpoints(struct net_device *dev)
} }
#else #else
if(priv->rx_urb){ kfree(priv->rx_urb);
kfree(priv->rx_urb); priv->rx_urb = NULL;
priv->rx_urb = NULL; kfree(priv->oldaddr);
} priv->oldaddr = NULL;
if(priv->oldaddr){
kfree(priv->oldaddr);
priv->oldaddr = NULL;
}
if (priv->pp_rxskb) { if (priv->pp_rxskb) {
kfree(priv->pp_rxskb); kfree(priv->pp_rxskb);
priv->pp_rxskb = 0; priv->pp_rxskb = 0;
@ -5828,10 +5818,8 @@ static int __devinit rtl8192_usb_probe(struct usb_interface *intf,
fail2: fail2:
rtl8192_down(dev); rtl8192_down(dev);
if (priv->pFirmware) { kfree(priv->pFirmware);
kfree(priv->pFirmware); priv->pFirmware = NULL;
priv->pFirmware = NULL;
}
rtl8192_usb_deleteendpoints(dev); rtl8192_usb_deleteendpoints(dev);
destroy_workqueue(priv->priv_wq); destroy_workqueue(priv->priv_wq);
mdelay(10); mdelay(10);
@ -5869,11 +5857,8 @@ static void __devexit rtl8192_usb_disconnect(struct usb_interface *intf)
rtl8192_proc_remove_one(dev); rtl8192_proc_remove_one(dev);
rtl8192_down(dev); rtl8192_down(dev);
if (priv->pFirmware) kfree(priv->pFirmware);
{ priv->pFirmware = NULL;
kfree(priv->pFirmware);
priv->pFirmware = NULL;
}
// priv->rf_close(dev); // priv->rf_close(dev);
// rtl8192_SetRFPowerState(dev, eRfOff); // rtl8192_SetRFPowerState(dev, eRfOff);
rtl8192_usb_deleteendpoints(dev); rtl8192_usb_deleteendpoints(dev);