diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2011-09-21 16:13:07 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:41:10 -0700 |
| commit | 508ed7445438cb6dffa105a128333c8461bfd5e4 (patch) | |
| tree | dc7d869f0739e377cabc6d004d60d452f30ef86c /net/wireless | |
| parent | 660702319c69a876dd20fac4499a588cbd66a79a (diff) | |
| download | kernel-mfld-blackbay-508ed7445438cb6dffa105a128333c8461bfd5e4.tar.gz kernel-mfld-blackbay-508ed7445438cb6dffa105a128333c8461bfd5e4.tar.bz2 kernel-mfld-blackbay-508ed7445438cb6dffa105a128333c8461bfd5e4.zip | |
cfg80211: Fix validation of AKM suites
commit 1b9ca0272ffae212e726380f66777b30a56ed7a5 upstream.
Incorrect variable was used in validating the akm_suites array from
NL80211_ATTR_AKM_SUITES. In addition, there was no explicit
validation of the array length (we only have room for
NL80211_MAX_NR_AKM_SUITES).
This can result in a buffer write overflow for stack variables with
arbitrary data from user space. The nl80211 commands using the affected
functionality require GENL_ADMIN_PERM, so this is only exposed to admin
users.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/wireless')
| -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 cea338150d0..1ac9443b526 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4044,9 +4044,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; } |