forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cfg80211: remove scan ies NULL check

Browse source 
There's no way scan BSS IEs can be NULL as even
if the allocation fails the frame is discarded.
Remove some code checking for this and document
that it is always non-NULL.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2013-02-05 16:51:29 +01:00
parent b207cdb07f
commit 83c7aa1a14
3 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
net/wireless/scan.c
View file

@ -1293,15 +1293,10 @@ ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info,
rcu_read_lock();
ies = rcu_dereference(bss->pub.ies);
if (ies) {
rem = ies->len;
ie = ies->data;
} else {
rem = 0;
ie = NULL;
}
rem = ies->len;
ie = ies->data;
while (ies && rem >= 2) {
while (rem >= 2) {
/* invalid data */
if (ie[1] > rem - 2)
break;