staging: rtl8192e: Fix various problems noted by smatch
Smatch reports the following problems: CHECK drivers/staging/rtl8192e/rtllib_softmac.c drivers/staging/rtl8192e/rtllib_softmac.c +3143 rtllib_softmac_free(4) info: redundant null check on ieee->pDot11dInfo calling kfree() CHECK drivers/staging/rtl8192e/rtllib_module.c drivers/staging/rtl8192e/rtllib_module.c +198 free_rtllib(6) info: redundant null check on ieee->pHTInfo calling kfree() CHECK drivers/staging/rtl8192e/rtl819x_TSProc.c drivers/staging/rtl8192e/rtl819x_TSProc.c +280 SearchAdmitTRStream(52) error: potential null derefence 'pRet'. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
2eed3dee92
commit
d7613e535e
3 changed files with 6 additions and 9 deletions
|
@ -277,7 +277,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (&pRet->List != psearch_list)
|
if (pRet && &pRet->List != psearch_list)
|
||||||
return pRet ;
|
return pRet ;
|
||||||
else
|
else
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -194,10 +194,9 @@ void free_rtllib(struct net_device *dev)
|
||||||
struct rtllib_device *ieee = (struct rtllib_device *)
|
struct rtllib_device *ieee = (struct rtllib_device *)
|
||||||
netdev_priv_rsl(dev);
|
netdev_priv_rsl(dev);
|
||||||
int i;
|
int i;
|
||||||
if (ieee->pHTInfo != NULL) {
|
|
||||||
kfree(ieee->pHTInfo);
|
kfree(ieee->pHTInfo);
|
||||||
ieee->pHTInfo = NULL;
|
ieee->pHTInfo = NULL;
|
||||||
}
|
|
||||||
rtllib_softmac_free(ieee);
|
rtllib_softmac_free(ieee);
|
||||||
del_timer_sync(&ieee->crypt_deinit_timer);
|
del_timer_sync(&ieee->crypt_deinit_timer);
|
||||||
rtllib_crypt_deinit_entries(ieee, 1);
|
rtllib_crypt_deinit_entries(ieee, 1);
|
||||||
|
|
|
@ -3139,10 +3139,8 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
|
||||||
void rtllib_softmac_free(struct rtllib_device *ieee)
|
void rtllib_softmac_free(struct rtllib_device *ieee)
|
||||||
{
|
{
|
||||||
down(&ieee->wx_sem);
|
down(&ieee->wx_sem);
|
||||||
if (NULL != ieee->pDot11dInfo) {
|
kfree(ieee->pDot11dInfo);
|
||||||
kfree(ieee->pDot11dInfo);
|
ieee->pDot11dInfo = NULL;
|
||||||
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);
|
||||||
|
|
Loading…
Add table
Reference in a new issue