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;
 	}