summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-09-27 15:47:33 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-27 15:47:33 -0400
commita8acfd82ebefbb32f12f413019e53f9e939cf44e (patch)
tree77ed527122c81600681eb86f2bfc9829b1af20d8 /net
parentd93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff)
parentba54238552625aad2d75f455a4d3db18ea7dec68 (diff)
downloadlinux-3.10-a8acfd82ebefbb32f12f413019e53f9e939cf44e.tar.gz
linux-3.10-a8acfd82ebefbb32f12f413019e53f9e939cf44e.tar.bz2
linux-3.10-a8acfd82ebefbb32f12f413019e53f9e939cf44e.zip
Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e83e7fee3bc..ea40d540a99 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4113,9 +4113,12 @@ static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev,
if (len % sizeof(u32))
return -EINVAL;
+ if (settings->n_akm_suites > NL80211_MAX_NR_AKM_SUITES)
+ return -EINVAL;
+
memcpy(settings->akm_suites, data, len);
- for (i = 0; i < settings->n_ciphers_pairwise; i++)
+ for (i = 0; i < settings->n_akm_suites; i++)
if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
return -EINVAL;
}