Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/mwifiex/sta_ioctl.c
View File

@ -162,11 +162,6 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
rcu_read_lock(); rcu_read_lock();
ies = rcu_dereference(bss->ies); ies = rcu_dereference(bss->ies);
if (WARN_ON(!ies)) {
/* should never happen */
rcu_read_unlock();
return -EINVAL;
}
beacon_ie = kmemdup(ies->data, ies->len, GFP_ATOMIC); beacon_ie = kmemdup(ies->data, ies->len, GFP_ATOMIC);
beacon_ie_len = ies->len; beacon_ie_len = ies->len;
rcu_read_unlock(); rcu_read_unlock();

8
include/net/cfg80211.h
View File

@ -1287,10 +1287,10 @@ struct cfg80211_bss_ies {
* @tsf: timestamp of last received update * @tsf: timestamp of last received update
* @beacon_interval: the beacon interval as from the frame * @beacon_interval: the beacon interval as from the frame
* @capability: the capability field in host byte order * @capability: the capability field in host byte order
* @ies: the information elements (Note that there * @ies: the information elements (Note that there is no guarantee that these
* is no guarantee that these are well-formed!); this is a pointer to * are well-formed!); this is a pointer to either the beacon_ies or
* either the beacon_ies or proberesp_ies depending on whether Probe * proberesp_ies depending on whether Probe Response frame has been
* Response frame has been received * received. It is always non-%NULL.
* @beacon_ies: the information elements from the last Beacon frame * @beacon_ies: the information elements from the last Beacon frame
* (implementation note: if @hidden_beacon_bss is set this struct doesn't * (implementation note: if @hidden_beacon_bss is set this struct doesn't
* own the beacon_ies, but they're just pointers to the ones from the * own the beacon_ies, but they're just pointers to the ones from the

11
net/wireless/scan.c
View File

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