i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Marvell Wifi driver: NULL check before dereferencing

Browse Source 
CID 5911.
This commit is contained in:
Philippe Saint-Pierre
2011-12-29 23:27:44 -05:00
parent 258c1019f1
commit c7199625ef
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/mwlhal.c
+14 -9
View File
@@ -1451,15 +1451,20 @@ mwl_hal_bastream_alloc(struct mwl_hal_vap *vap, int ba_policy,
} }
sp = &mh->mh_streams[s]; sp = &mh->mh_streams[s];
mh->mh_bastreams &= ~(1<<s); mh->mh_bastreams &= ~(1<<s);
sp->public.data[0] = a1; if (sp != NULL) {
sp->public.data[1] = a2; sp->public.data[0] = a1;
IEEE80211_ADDR_COPY(sp->macaddr, Macaddr); sp->public.data[1] = a2;
sp->tid = Tid; IEEE80211_ADDR_COPY(sp->macaddr, Macaddr);
sp->paraminfo = ParamInfo; sp->tid = Tid;
sp->setup = 0; sp->paraminfo = ParamInfo;
sp->ba_policy = ba_policy; sp->setup = 0;
MWL_HAL_UNLOCK(mh); sp->ba_policy = ba_policy;
return sp != NULL ? &sp->public : NULL; MWL_HAL_UNLOCK(mh);
return &sp->public;
} else {
MWL_HAL_UNLOCK(mh);
return NULL;
}
} }
const MWL_HAL_BASTREAM * const MWL_HAL_BASTREAM *