]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] mac80211: Fix SSID matching in AP selection
authorMichael Wu <flamingice@sourmilk.net>
Fri, 19 Oct 2007 21:14:36 +0000 (17:14 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Oct 2007 02:32:05 +0000 (22:32 -0400)
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>
net/mac80211/ieee80211_sta.c

index f7ffeec3913f3691d662663977ebe45e04ac2e89..77ef223a9431a233d409ce21225090814f05d047 100644 (file)
@@ -2096,7 +2096,8 @@ static int ieee80211_sta_match_ssid(struct ieee80211_if_sta *ifsta,
 {
        int tmp, hidden_ssid;
 
-       if (!memcmp(ifsta->ssid, ssid, ssid_len))
+       if (ssid_len == ifsta->ssid_len &&
+           !memcmp(ifsta->ssid, ssid, ssid_len))
                return 1;
 
        if (ifsta->flags & IEEE80211_STA_AUTO_BSSID_SEL)