From e89cca1f1f56cf3fcdcf43383b37be2d1c0cf6ed Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 16 Sep 2011 13:45:25 +0200 Subject: [PATCH] --- yaml --- r: 266291 b: refs/heads/master c: 39193498913f82dd7e484aa908843ca4114c3b0c h: refs/heads/master i: 266289: cfdbbceb50f0ca9b66472c0824da7cf1bc739c39 266287: 81dbc9dbd0bf255366c5d126839689ad33cb1635 v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8dc79dece425..4fdff0666e01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbb5574224168ef62c8549535c0d0a99e989ecf3 +refs/heads/master: 39193498913f82dd7e484aa908843ca4114c3b0c diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index 11089541bb03..430b432bc3f0 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -4527,8 +4527,12 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) wiphy = &rdev->wiphy; - if (info->attrs[NL80211_ATTR_MAC]) + if (info->attrs[NL80211_ATTR_MAC]) { ibss.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]); + + if (!is_valid_ether_addr(ibss.bssid)) + return -EINVAL; + } ibss.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]); ibss.ssid_len = nla_len(info->attrs[NL80211_ATTR_SSID]);