From 85e8b3a70697cc21acc701437901a0126e40653d Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 21 Sep 2011 16:13:07 +0300 Subject: [PATCH] --- yaml --- r: 264171 b: refs/heads/master c: 1b9ca0272ffae212e726380f66777b30a56ed7a5 h: refs/heads/master i: 264169: b3e0353a05968020fa66a0cf99440731012275b3 264167: 81b69c91769f8a67cd30275f317d20ec20e33ff5 v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e90b8a0960b9..187aa8b46617 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65d0f19e583e80e42b1c67c166bfc4dfdf6ab693 +refs/heads/master: 1b9ca0272ffae212e726380f66777b30a56ed7a5 diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index e83e7fee3bc0..ea40d540a990 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/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; }