diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-09-14 21:34:14 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-14 16:14:27 -0400 |
| commit | a2c1e3dad516618cb0fbfb1a62c36d0b0744573a (patch) | |
| tree | 3a5177c062d839e0c93998e2706e45a9fcd1852f /net | |
| parent | 364734fafbba0c3133e482db78149b9a823ae7a5 (diff) | |
| download | blackbird-op-linux-a2c1e3dad516618cb0fbfb1a62c36d0b0744573a.tar.gz blackbird-op-linux-a2c1e3dad516618cb0fbfb1a62c36d0b0744573a.zip | |
mac80211: match only assigned bss in sta_info_get_bss
sta_info_get_bss() is used to match STA pointers
for VLAN/AP interfaces, but if the same station
is also added to multiple other interfaces it
will erroneously match because both pointers are
NULL, fix this by ignoring NULL pointers here.
Reported-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/sta_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 687077e49dc6..e356ff80671a 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -125,7 +125,7 @@ struct sta_info *sta_info_get_bss(struct ieee80211_sub_if_data *sdata, lockdep_is_held(&local->sta_mtx)); while (sta) { if ((sta->sdata == sdata || - sta->sdata->bss == sdata->bss) && + (sta->sdata->bss && sta->sdata->bss == sdata->bss)) && memcmp(sta->sta.addr, addr, ETH_ALEN) == 0) break; sta = rcu_dereference_check(sta->hnext, |
