diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-04-07 11:32:11 +0300 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-07-27 12:27:12 -0700 |
| commit | f7a01d510210d4ec539820c034b85d426a641e76 (patch) | |
| tree | 31cc01636db65fff7efe107063ea547a5de43f78 | |
| parent | 326450198720862ade868801cc2f43597f3c1fd8 (diff) | |
| download | android_external_wpa_supplicant_8-f7a01d510210d4ec539820c034b85d426a641e76.tar.gz android_external_wpa_supplicant_8-f7a01d510210d4ec539820c034b85d426a641e76.tar.bz2 android_external_wpa_supplicant_8-f7a01d510210d4ec539820c034b85d426a641e76.zip | |
P2P: Validate SSID element length before copying it
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.
Change-Id: I9f350f20cdd010f2c096514b245b4a901ad74e46
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
| -rw-r--r-- | src/p2p/p2p.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 7d4a03c5..28c3aa00 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -736,6 +736,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)) { |