aboutsummaryrefslogtreecommitdiffstats
path: root/src/p2p
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-04-10 09:45:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-10 09:45:41 +0000
commit56509450883285e6384f7e51d97a726456d367a2 (patch)
tree31cc01636db65fff7efe107063ea547a5de43f78 /src/p2p
parent0a217de1802bc5cf785524c1913af7ae3faa9c54 (diff)
parentdc5da6ac19accd8d31dc8977a48d01422b3862f5 (diff)
downloadandroid_external_wpa_supplicant_8-56509450883285e6384f7e51d97a726456d367a2.tar.gz
android_external_wpa_supplicant_8-56509450883285e6384f7e51d97a726456d367a2.tar.bz2
android_external_wpa_supplicant_8-56509450883285e6384f7e51d97a726456d367a2.zip
am dc5da6ac: am b73408d1: am fdb708a3: P2P: Validate SSID element length before copying it
* commit 'dc5da6ac19accd8d31dc8977a48d01422b3862f5': P2P: Validate SSID element length before copying it
Diffstat (limited to 'src/p2p')
-rw-r--r--src/p2p/p2p.c1
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)) {