diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-27 09:52:29 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-27 10:38:37 +0200 |
| commit | 7590c27ae3b50c89211f1459a5d2aa2d1f9a23d3 (patch) | |
| tree | 47e3ae1789de67ca755267ff7778c572b3ac0665 /patches | |
| parent | 1faa58d0e0f432fa9adf2cc48f543b70ecdb5fe8 (diff) | |
| download | ptxdist-7590c27ae3b50c89211f1459a5d2aa2d1f9a23d3.tar.gz ptxdist-7590c27ae3b50c89211f1459a5d2aa2d1f9a23d3.tar.xz | |
wpa_supplicant: add upstream security fix
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/wpa_supplicant-2.4/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch | 38 | ||||
| -rw-r--r-- | patches/wpa_supplicant-2.4/series | 4 |
2 files changed, 42 insertions, 0 deletions
diff --git a/patches/wpa_supplicant-2.4/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch b/patches/wpa_supplicant-2.4/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch new file mode 100644 index 000000000..d7a80d890 --- /dev/null +++ b/patches/wpa_supplicant-2.4/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch @@ -0,0 +1,38 @@ +From: Jouni Malinen <jouni@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@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 6adb3dc2049f..5de320eaad24 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)) { diff --git a/patches/wpa_supplicant-2.4/series b/patches/wpa_supplicant-2.4/series new file mode 100644 index 000000000..e6842051f --- /dev/null +++ b/patches/wpa_supplicant-2.4/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch +# 350afff2fed554f403cf9fd3ebf06e20 - git-ptx-patches magic |