Skip to contentSkip to conversation

hostapd: bump to version 2.5

PATCH New Baruch Siach 2 participants 4 messages Sep 29, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 hostapd: bump to version 2.5

Remove upstream patches.

---
 ...Fix-HTTP-chunked-transfer-encoding-parser.patch |  50 -------
 ...integer-underflow-in-WMM-Action-frame-par.patch |  42 ------
 package/hostapd/0003-EAP-pwd-fixes.patch           | 154 ---------------------
 package/hostapd/hostapd.hash                       |   2 +-
 package/hostapd/hostapd.mk                         |   2 +-
 5 files changed, 2 insertions(+), 248 deletions(-)
 delete mode 100644 package/hostapd/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
 delete mode 100644 package/hostapd/0002-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch
 delete mode 100644 package/hostapd/0003-EAP-pwd-fixes.patch
package/hostapd/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch deleted +0 -50
deleted file mode 100644
index d9dccf911669..000000000000
@@ -1,50 +0,0 @@
-From 5acd23f4581da58683f3cf5e36cb71bbe4070bd7 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <[email protected]>
-Date: Tue, 28 Apr 2015 17:08:33 +0300
-Subject: [PATCH] WPS: Fix HTTP chunked transfer encoding parser
-
-strtoul() return value may end up overflowing the int h->chunk_size and
-resulting in a negative value to be stored as the chunk_size. This could
-result in the following memcpy operation using a very large length
-argument which would result in a buffer overflow and segmentation fault.
-
-This could have been used to cause a denial service by any device that
-has been authorized for network access (either wireless or wired). This
-would affect both the WPS UPnP functionality in a WPS AP (hostapd with
-upnp_iface parameter set in the configuration) and WPS ER
-(wpa_supplicant with WPS_ER_START control interface command used).
-
-Validate the parsed chunk length value to avoid this. In addition to
-rejecting negative values, we can also reject chunk size that would be
-larger than the maximum configured body length.
-
-Thanks to Kostya Kortchinsky of Google security team for discovering and
-reporting this issue.
-
-Signed-off-by: Jouni Malinen <[email protected]>
-Signed-off-by: Baruch Siach <[email protected]>
----
- src/wps/httpread.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/wps/httpread.c b/src/wps/httpread.c
-index 2f08f37275c0..d2855e32fd0f 100644
---- a/src/wps/httpread.c
-+++ b/src/wps/httpread.c
-@@ -533,6 +533,13 @@ static void httpread_read_handler(int sd, void *eloop_ctx, void *sock_ctx)
- 					if (!isxdigit(*cbp))
- 						goto bad;
- 					h->chunk_size = strtoul(cbp, NULL, 16);
-+					if (h->chunk_size < 0 ||
-+					    h->chunk_size > h->max_bytes) {
-+						wpa_printf(MSG_DEBUG,
-+							   "httpread: Invalid chunk size %d",
-+							   h->chunk_size);
-+						goto bad;
-+					}
- 					/* throw away chunk header
- 					 * so we have only real data
- 					 */
--- 
-2.1.4
-
package/hostapd/0002-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch deleted +0 -42

42 lines not on this page · raw message

package/hostapd/0003-EAP-pwd-fixes.patch deleted +0 -154

154 lines not on this page · raw message

package/hostapd/hostapd.hash +1 -1
index 3c7b63ded48f..869849b6408f 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	6fe0eb6bd1c9cbd24952ece8586b6f7bd14ab358edfda99794e79b9b9dbd657f  hostapd-2.4.tar.gz
+sha256	8e272d954dc0d7026c264b79b15389ec2b2c555b32970de39f506b9f463ec74a  hostapd-2.5.tar.gz
package/hostapd/hostapd.mk +1 -1
index 1ad32a24655c..e22e53f81916 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOSTAPD_VERSION = 2.4
+HOSTAPD_VERSION = 2.5
 HOSTAPD_SITE = http://hostap.epitest.fi/releases
 HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
Signature · 1 line
2.5.3
#1 lore raw

PATCH 2/2 wpa_supplicant: bump to version 2.5

Remove upstream patches. Renumber the remaining patch.

---
 ...e-SSID-element-length-before-copying-it-C.patch |  45 ------
 ...patch => 0001-fix-readline-libs-ordering.patch} |   0
 ...Fix-HTTP-chunked-transfer-encoding-parser.patch |  50 -------
 ...integer-underflow-in-WMM-Action-frame-par.patch |  42 ------
 package/wpa_supplicant/0004-EAP-pwd-fixes.patch    | 154 ---------------------
 package/wpa_supplicant/wpa_supplicant.hash         |   2 +-
 package/wpa_supplicant/wpa_supplicant.mk           |   2 +-
 7 files changed, 2 insertions(+), 293 deletions(-)
 delete mode 100644 package/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
 rename package/wpa_supplicant/{0005-fix-readline-libs-ordering.patch => 0001-fix-readline-libs-ordering.patch} (100%)
 delete mode 100644 package/wpa_supplicant/0002-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
 delete mode 100644 package/wpa_supplicant/0003-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch
 delete mode 100644 package/wpa_supplicant/0004-EAP-pwd-fixes.patch
package/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch deleted +0 -45
deleted file mode 100644
index 989bc4f786a3..000000000000
@@ -1,45 +0,0 @@
-From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <[email protected]>
-Date: Tue, 7 Apr 2015 11:32:11 +0300
-Subject: [PATCH] P2P: Validate SSID element length before copying it
- (CVE-2015-1863)
-
-Upstream commit 9ed4eee345f85e3025c33c6e20aa25696e341ccd.
-
-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 <[email protected]>
-Signed-off-by: Baruch Siach <[email protected]>
----
- 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)) {
--- 
-1.9.1
-
package/wpa_supplicant/0001-fix-readline-libs-ordering.patch renamed from package/wpa_supplicant/0005-fix-readline-libs-ordering.patch +0 -0
similarity index 100%
rename from package/wpa_supplicant/0005-fix-readline-libs-ordering.patch
rename to package/wpa_supplicant/0001-fix-readline-libs-ordering.patch
package/wpa_supplicant/0002-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch deleted +0 -50

50 lines not on this page · raw message

package/wpa_supplicant/0003-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch deleted +0 -42

42 lines not on this page · raw message

package/wpa_supplicant/0004-EAP-pwd-fixes.patch deleted +0 -154

154 lines not on this page · raw message

package/wpa_supplicant/wpa_supplicant.hash +1 -1
index 1ec33672398c..19e43598f2bd 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122  wpa_supplicant-2.4.tar.gz
+sha256	cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316  wpa_supplicant-2.5.tar.gz
package/wpa_supplicant/wpa_supplicant.mk +1 -1
index eb4278a667de..1a3e0dbb474a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPA_SUPPLICANT_VERSION = 2.4
+WPA_SUPPLICANT_VERSION = 2.5
 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
 WPA_SUPPLICANT_LICENSE = GPLv2/BSD-3c
 WPA_SUPPLICANT_LICENSE_FILES = README
Signature · 1 line
2.5.3
#2 lore raw

PATCH 2/2 wpa_supplicant: bump to version 2.5

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Remove upstream patches. Renumber the remaining patch.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard