aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-10-17 18:18:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-10-17 18:18:17 +0000
commitb68a1fd138099993283a45f787a35e5c68e69548 (patch)
treed35c416f214fc794f844b20c194bc4b752206ecd /package
parentf9ccb7bf5a0cc95df783c26b5dd7699de22f6d11 (diff)
downloadupstream-b68a1fd138099993283a45f787a35e5c68e69548.tar.gz
upstream-b68a1fd138099993283a45f787a35e5c68e69548.tar.bz2
upstream-b68a1fd138099993283a45f787a35e5c68e69548.zip
hostapd: merge a security fix for a TLS message buffer overflow (CVE-2012-4445)
Backport of r33815 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33816 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/hostapd/patches/001-CVE-2012-4445.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/package/hostapd/patches/001-CVE-2012-4445.patch b/package/hostapd/patches/001-CVE-2012-4445.patch
new file mode 100644
index 0000000000..1b8bdd00c5
--- /dev/null
+++ b/package/hostapd/patches/001-CVE-2012-4445.patch
@@ -0,0 +1,17 @@
+--- a/src/eap_server/eap_server_tls_common.c
++++ b/src/eap_server/eap_server_tls_common.c
+@@ -228,6 +228,14 @@ static int eap_server_tls_process_fragme
+ return -1;
+ }
+
++ if (len > message_length) {
++ wpa_printf(MSG_INFO, "SSL: Too much data (%d bytes) in "
++ "first fragment of frame (TLS Message "
++ "Length %d bytes)",
++ (int) len, (int) message_length);
++ return -1;
++ }
++
+ data->tls_in = wpabuf_alloc(message_length);
+ if (data->tls_in == NULL) {
+ wpa_printf(MSG_DEBUG, "SSL: No memory for message");