staging: rtl8188eu: fix possible NULL dereference
dm_odm was being checked for NULL after dereferencing it. Lets check for NULL first before derefenrencing it. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2b05df556e
commit
f1126b1d0d
|
@ -659,11 +659,11 @@ void ODM_RA_UpdateRateInfo_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rate
|
||||||
{
|
{
|
||||||
struct odm_ra_info *pRaInfo = NULL;
|
struct odm_ra_info *pRaInfo = NULL;
|
||||||
|
|
||||||
|
if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
|
||||||
|
return;
|
||||||
ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
|
ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
|
||||||
("macid =%d RateID = 0x%x RateMask = 0x%x SGIEnable =%d\n",
|
("macid =%d RateID = 0x%x RateMask = 0x%x SGIEnable =%d\n",
|
||||||
macid, RateID, RateMask, SGIEnable));
|
macid, RateID, RateMask, SGIEnable));
|
||||||
if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
|
|
||||||
return;
|
|
||||||
|
|
||||||
pRaInfo = &(dm_odm->RAInfo[macid]);
|
pRaInfo = &(dm_odm->RAInfo[macid]);
|
||||||
pRaInfo->RateID = RateID;
|
pRaInfo->RateID = RateID;
|
||||||
|
@ -676,10 +676,10 @@ void ODM_RA_SetRSSI_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rssi)
|
||||||
{
|
{
|
||||||
struct odm_ra_info *pRaInfo = NULL;
|
struct odm_ra_info *pRaInfo = NULL;
|
||||||
|
|
||||||
ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,
|
|
||||||
(" macid =%d Rssi =%d\n", macid, Rssi));
|
|
||||||
if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
|
if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
|
||||||
return;
|
return;
|
||||||
|
ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,
|
||||||
|
(" macid =%d Rssi =%d\n", macid, Rssi));
|
||||||
|
|
||||||
pRaInfo = &(dm_odm->RAInfo[macid]);
|
pRaInfo = &(dm_odm->RAInfo[macid]);
|
||||||
pRaInfo->RssiStaRA = Rssi;
|
pRaInfo->RssiStaRA = Rssi;
|
||||||
|
|
Loading…
Reference in a new issue