summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-09-16 13:45:25 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-09-19 16:10:13 -0400
commit39193498913f82dd7e484aa908843ca4114c3b0c (patch)
tree14951970eaaa7c66a1e6b2f820b5f7cae8d2280a /net/wireless
parentbbb5574224168ef62c8549535c0d0a99e989ecf3 (diff)
downloadlinux-3.10-39193498913f82dd7e484aa908843ca4114c3b0c.tar.gz
linux-3.10-39193498913f82dd7e484aa908843ca4114c3b0c.tar.bz2
linux-3.10-39193498913f82dd7e484aa908843ca4114c3b0c.zip
cfg80211: validate IBSS BSSID
The IBSS BSSID is never validated, so an invalid one might end up being used. Fix this by rejecting invalid configuration. Reported-by: Marek Lindner <lindner_marek@yahoo.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 11089541bb0..430b432bc3f 100644
--- a/net/wireless/nl80211.c
+++ b/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]);