adamwill pushed to wpa_supplicant (f20). "backport fix for CVE-2015-1863"

[notifications at fedoraproject.org]

>From beede8e58eff2cacda3a42bba53be205cb7686fe Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam at redhat.com>
Date: Thu, 23 Apr 2015 10:25:27 -0700
Subject: backport fix for CVE-2015-1863


diff --git a/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch b/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
new file mode 100644
index 0000000..626a753
--- /dev/null
+++ b/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
@@ -0,0 +1,42 @@
+From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni at qca.qualcomm.com>
+Date: Tue, 7 Apr 2015 11:32:11 +0300
+Subject: [PATCH] P2P: Validate SSID element length before copying it
+ (CVE-2015-1863)
+
+This fixes a possible memcpy overflow for P2P dev->oper_ssid in
+p2p_add_device(). The length provided by the peer device (0..255 bytes)
+was used without proper bounds checking and that could have resulted in
+arbitrary data of up to 223 bytes being written beyond the end of the
+dev->oper_ssid[] array (of which about 150 bytes would be beyond the
+heap allocation) when processing a corrupted management frame for P2P
+peer discovery purposes.
+
+This could result in corrupted state in heap, unexpected program
+behavior due to corrupted P2P peer device information, denial of service
+due to process crash, exposure of memory contents during GO Negotiation,
+and potentially arbitrary code execution.
+
+Thanks to Google security team for reporting this issue and smart
+hardware research group of Alibaba security team for discovering it.
+
+Signed-off-by: Jouni Malinen <jouni at qca.qualcomm.com>
+---
+ src/p2p/p2p.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
+index f584fae..a45fe73 100644
+--- a/src/p2p/p2p.c
++++ b/src/p2p/p2p.c
+@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
+ 	if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
+ 		os_memcpy(dev->interface_addr, addr, ETH_ALEN);
+ 	if (msg.ssid &&
++	    msg.ssid[1] <= sizeof(dev->oper_ssid) &&
+ 	    (msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
+ 	     os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
+ 	     != 0)) {
+-- 
+2.3.5
+
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index fb8370c..7bfad73 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -7,7 +7,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 2.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
@@ -49,6 +49,9 @@ Patch10: rh1032758-fix-pmksa-cache-entry-clearing.patch
 # CVE-2014-3686
 Patch11: 0001-Add-os_exec-helper-to-run-external-programs.patch
 Patch12: 0002-wpa_cli-Use-os_exec-for-action-script-execution.patch
+# CVE-2015-1863, backport from upstream master, will be in 2.5
+# http://w1.fi/cgit/hostap/commit/?id=9ed4eee345f85e3025c33c6e20aa25696e341ccd
+Patch13: 0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
 
 %if %{build_libeap}
 # Dirty hack for WiMAX
@@ -123,6 +126,7 @@ Don't use this unless you know what you're doing.
 %patch10 -p1 -b .pmksa-clear-fix
 %patch11 -p1 -b .CVE-2014-3686-1
 %patch12 -p1 -b .CVE-2014-3686-2
+%patch13 -p1 -b .cve-2015-1863
 
 %build
 pushd wpa_supplicant
@@ -270,6 +274,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 23 2015 Adam Williamson <awilliam at redhat.com> - 1:2.0-13
+- backport fix for CVE-2015-1863
+
 * Wed Oct 22 2014 Dan Williams <dcbw at redhat.com> - 1:2.0-12
 - Use os_exec() for action script execution (CVE-2014-3686)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/wpa_supplicant.git/commit/?h=f20&id=beede8e58eff2cacda3a42bba53be205cb7686fe