[pkg-wpa-devel] r1933 - in /wpa/trunk/debian: changelog patches/series patches/wpasupplicant_P2P-Validate-SSID-element-length-before-copying-it-C.patch

[slh-guest at users.alioth.debian.org]

Author: slh-guest
Date: Thu Apr 23 03:09:52 2015
New Revision: 1933

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1933
Log:
import "P2P: Validate SSID element length before copying it
(CVE-2015-1863)" from upstream (Closes: #783148).

Added:
    wpa/trunk/debian/patches/wpasupplicant_P2P-Validate-SSID-element-length-before-copying-it-C.patch
Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/patches/series

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1933&op=diff
==============================================================================
--- wpa/trunk/debian/changelog	(original)
+++ wpa/trunk/debian/changelog	Thu Apr 23 03:09:52 2015
@@ -1,6 +1,5 @@
-wpa (2.3-2) UNRELEASED; urgency=medium
-
-  * NOT RELEASED YET
+wpa (2.3-2) unstable; urgency=medium
+
   * remove Kel Modderman from Uploaders as per his request, many thanks for
     all past efforts Kel.
   * fix systemd unit dependencies for wpasupplicant, it needs to be started
@@ -9,8 +8,10 @@
   * hostapd: avoid segfault with driver=wired, by merging upstream commit
     e9b783d58c23a7bb50b2f25bce7157f1f3b5d58b "Fix hostapd operation without
     hw_mode driver data."
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Tue, 17 Mar 2015 02:23:24 +0100
+  * import "P2P: Validate SSID element length before copying it
+    (CVE-2015-1863)" from upstream (Closes: #783148).
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Thu, 23 Apr 2015 05:02:21 +0200
 
 wpa (2.3-1) unstable; urgency=medium
 

Modified: wpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/series?rev=1933&op=diff
==============================================================================
--- wpa/trunk/debian/patches/series	(original)
+++ wpa/trunk/debian/patches/series	Thu Apr 23 03:09:52 2015
@@ -8,3 +8,4 @@
 include-ieee802_11_common.c-in-wpa_supplicant-build-.patch
 hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch
 wpasupplicant_fix-systemd-unit-dependencies.patch
+wpasupplicant_P2P-Validate-SSID-element-length-before-copying-it-C.patch

Added: wpa/trunk/debian/patches/wpasupplicant_P2P-Validate-SSID-element-length-before-copying-it-C.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/wpasupplicant_P2P-Validate-SSID-element-length-before-copying-it-C.patch?rev=1933&op=file
==============================================================================
--- wpa/trunk/debian/patches/wpasupplicant_P2P-Validate-SSID-element-length-before-copying-it-C.patch	(added)
+++ wpa/trunk/debian/patches/wpasupplicant_P2P-Validate-SSID-element-length-before-copying-it-C.patch	Thu Apr 23 03:09:52 2015
@@ -0,0 +1,37 @@
+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(+)
+
+--- a/src/p2p/p2p.c
++++ b/src/p2p/p2p.c
+@@ -736,6 +736,7 @@ int p2p_add_device(struct p2p_data *p2p,
+ 	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)) {