[PATCH] mac80211: fix bug in ieee80211_build_probe_req

DORMANTno replies

From: Johannes Berg <johannes@sipsolutions.net>
Date: 2011-11-08 12:04:46

From: Johannes Berg <redacted>

ieee80211_probereq_get() can return NULL in
which case we should clean up & return NULL
in ieee80211_build_probe_req() as well.

Cc: stable@vger.kernel.org
Signed-off-by: Johannes Berg <redacted>
---
 net/mac80211/util.c |    4 ++++
 1 file changed, 4 insertions(+)
--- a/net/mac80211/util.c	2011-11-08 09:24:02.000000000 +0100
+++ b/net/mac80211/util.c	2011-11-08 12:50:12.000000000 +0100
@@ -880,6 +880,8 @@ struct sk_buff *ieee80211_build_probe_re
 	skb = ieee80211_probereq_get(&local->hw, &sdata->vif,
 				     ssid, ssid_len,
 				     buf, buf_len);
+	if (!skb)
+		goto out;
 
 	if (dst) {
 		mgmt = (struct ieee80211_mgmt *) skb->data;
@@ -888,6 +890,8 @@ struct sk_buff *ieee80211_build_probe_re
 	}
 
 	IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
+
+ out:
 	kfree(buf);
 
 	return skb;

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help