[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>

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,
 {
         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)