summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2016-09-13 16:25:58 +0200
committerJohannes Berg <johannes.berg@intel.com>2016-09-13 20:20:51 +0200
commitb6b5555bc89f52e49244104ca4d7764c7b0f11cd (patch)
tree9d1f60df03f7ab85f2885af62ac63a22942c3437 /net/wireless
parent4854f175c3182816d906c4bc34be5f30556346a5 (diff)
downloadlinux-stable-b6b5555bc89f52e49244104ca4d7764c7b0f11cd.tar.gz
linux-stable-b6b5555bc89f52e49244104ca4d7764c7b0f11cd.tar.bz2
linux-stable-b6b5555bc89f52e49244104ca4d7764c7b0f11cd.zip
cfg80211: disallow shared key authentication with key index 4
Key index 4 can only be used for an IGTK, so the range checks for shared key authentication should treat 4 as an error, fix that in the code. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/mlme.c2
-rw-r--r--net/wireless/nl80211.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index c284d883c349..d6abb0704db5 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -222,7 +222,7 @@ int cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,
ASSERT_WDEV_LOCK(wdev);
if (auth_type == NL80211_AUTHTYPE_SHARED_KEY)
- if (!key || !key_len || key_idx < 0 || key_idx > 4)
+ if (!key || !key_len || key_idx < 0 || key_idx > 3)
return -EINVAL;
if (wdev->current_bss &&
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 7ebad350abc1..c11c1ef6daa7 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7388,7 +7388,7 @@ static int nl80211_authenticate(struct sk_buff *skb, struct genl_info *info)
(key.p.cipher != WLAN_CIPHER_SUITE_WEP104 ||
key.p.key_len != WLAN_KEY_LEN_WEP104))
return -EINVAL;
- if (key.idx > 4)
+ if (key.idx > 3)
return -EINVAL;
} else {
key.p.key_len = 0;