diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-27 21:47:33 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-27 21:47:33 +0200 |
| commit | a8acfd82ebefbb32f12f413019e53f9e939cf44e (patch) | |
| tree | 77ed527122c81600681eb86f2bfc9829b1af20d8 /net | |
| parent | Linux 3.1-rc7 (diff) | |
| parent | ath9k: Fix a dma warning/memory leak (diff) | |
| download | linux-a8acfd82ebefbb32f12f413019e53f9e939cf44e.tar.xz linux-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.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index e83e7fee3bc0..ea40d540a990 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; } |