From 49ec35f70e10904aa80f046934bad1b0b57fa7f6 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Thu, 29 Mar 2012 16:30:41 +0200
Subject: [PATCH] --- yaml --- r: 300687 b: refs/heads/master c:
 88c868c43ba38ac3bab07bab4c45b4bc44c94357 h: refs/heads/master i:   300685:
 4e3cb9bc835e7fbe940f7fe78fcf55308ca7eddf   300683:
 3978a1b264945e9f3705c4e4d6fcb5438f0afa1a   300679:
 8518122c29d0ed739325575baeadcbdb3ad77766   300671:
 74be49a5d28cb33bab28a6dae1d2b92fdc30bb29 v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/mlme.c | 19 ++++++++++++++++---
 trunk/net/mac80211/tx.c   |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 69976d5895d9..79b7c01976de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c5057b22a60b23353dda93c57e475856ca286c
+refs/heads/master: 88c868c43ba38ac3bab07bab4c45b4bc44c94357
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 93d484c8a0b8..12ca9820689a 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -1518,9 +1518,16 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
 		ifmgd->nullfunc_failed = false;
 		ieee80211_send_nullfunc(sdata->local, sdata, 0);
 	} else {
+		int ssid_len;
+
 		ssid = ieee80211_bss_get_ie(ifmgd->associated, WLAN_EID_SSID);
-		ieee80211_send_probe_req(sdata, dst, ssid + 2, ssid[1], NULL, 0,
-					 (u32) -1, true, false);
+		if (WARN_ON_ONCE(ssid == NULL))
+			ssid_len = 0;
+		else
+			ssid_len = ssid[1];
+
+		ieee80211_send_probe_req(sdata, dst, ssid + 2, ssid_len, NULL,
+					 0, (u32) -1, true, false);
 	}
 
 	ifmgd->probe_send_count++;
@@ -1596,6 +1603,7 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
 	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 	struct sk_buff *skb;
 	const u8 *ssid;
+	int ssid_len;
 
 	if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION))
 		return NULL;
@@ -1606,8 +1614,13 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
 		return NULL;
 
 	ssid = ieee80211_bss_get_ie(ifmgd->associated, WLAN_EID_SSID);
+	if (WARN_ON_ONCE(ssid == NULL))
+		ssid_len = 0;
+	else
+		ssid_len = ssid[1];
+
 	skb = ieee80211_build_probe_req(sdata, ifmgd->associated->bssid,
-					(u32) -1, ssid + 2, ssid[1],
+					(u32) -1, ssid + 2, ssid_len,
 					NULL, 0, true);
 
 	return skb;
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 14a01c81f959..e0b89780b472 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -2602,7 +2602,7 @@ struct sk_buff *ieee80211_probereq_get(struct ieee80211_hw *hw,
 	pos = skb_put(skb, ie_ssid_len);
 	*pos++ = WLAN_EID_SSID;
 	*pos++ = ssid_len;
-	if (ssid)
+	if (ssid_len)
 		memcpy(pos, ssid, ssid_len);
 	pos += ssid_len;