lkml.org 
[lkml]   [2011]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the wireless tree with the wireless-current tree
Hi John,

Today's linux-next merge of the wireless tree got a conflict in
net/wireless/nl80211.c between commit 1b9ca0272ffa ("cfg80211: Fix
validation of AKM suites") from the wireless-current tree and commit
6d30240e3d68 ("cfg80211: Remove strict validation of AKM suites") from
the wireless tree.

The latter seems to make the former partly unneccessary, so I used that
(see below).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc net/wireless/nl80211.c
index 1b79a56,bf3fc4f..0000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -4304,14 -4300,7 +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;


\
 
 \ /
  Last update: 2011-09-28 05:21    [W:0.141 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site