summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-09-28 10:28:09 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-28 10:28:09 -0400
commit0874073570d9184a169a4ae2abbe8dbcb71878e9 (patch)
tree81af47abc50641f911e3b5833850357a48a82be8 /net/wireless
parentcd32984f64cb4fdd84e33f30da1f10582fc43cbf (diff)
parentba54238552625aad2d75f455a4d3db18ea7dec68 (diff)
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
Conflicts: drivers/net/wireless/iwlwifi/iwl-scan.c net/wireless/nl80211.c
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index bf3fc4f264f..b85075761e2 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4300,6 +4300,9 @@ 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);
}