From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 28 Sep 2011 14:28:09 +0000 (-0400)
Subject: Merge branch 'master' of git://git.infradead.org/users/linville/wireless
X-Git-Tag: upstream/snapshot3+hdmi~8889^2~183^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0874073570d9184a169a4ae2abbe8dbcb71878e9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-scan.c
	net/wireless/nl80211.c
---

0874073570d9184a169a4ae2abbe8dbcb71878e9
diff --cc net/wireless/nl80211.c
index bf3fc4f,ea40d54..b850757
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -4300,7 -4113,14 +4300,10 @@@ static int nl80211_crypto_settings(stru
  		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_akm_suites; i++)
 -			if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
 -				return -EINVAL;
  	}
  
  	return 0;