aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorMichael Wu <flamingice@sourmilk.net>2007-10-19 17:14:36 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-10-25 22:32:05 -0400
commit48225709bec68c2d8612718922f974f22214a308 (patch)
tree4f11d04567fb90d5218fd8a3636ff937fb54c5b0 /net/mac80211
parentc9927c2bf4f45bb85e8b502ab3fb79ad6483c244 (diff)
[PATCH] mac80211: Fix SSID matching in AP selection
The length of the SSID desired should also be compared in addition to the memcmp of the SSIDs. Thanks to Andrea Merello <andreamrl@tiscali.it> for finding this issue. Signed-off-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211_sta.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index f7ffeec3913f..77ef223a9431 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -2096,7 +2096,8 @@ static int ieee80211_sta_match_ssid(struct ieee80211_if_sta *ifsta,
2096{ 2096{
2097 int tmp, hidden_ssid; 2097 int tmp, hidden_ssid;
2098 2098
2099 if (!memcmp(ifsta->ssid, ssid, ssid_len)) 2099 if (ssid_len == ifsta->ssid_len &&
2100 !memcmp(ifsta->ssid, ssid, ssid_len))
2100 return 1; 2101 return 1;
2101 2102
2102 if (ifsta->flags & IEEE80211_STA_AUTO_BSSID_SEL) 2103 if (ifsta->flags & IEEE80211_STA_AUTO_BSSID_SEL)