commit 5a0635b4a35f29fed9243d35486c6b3aead8eba3
author Dmitry Shmidt <dimitrysh@google.com> Fri Apr 24 17:14:06 2015 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Fri Apr 24 17:14:06 2015 +0000
tree 13e1451ecc315c5ed5ff7fa557daf20d1c7d3ef6
parent 7916ac221059b8aa6385b255b025aa542bc2de4d
parent 9d9e60286e05ae45025b672636490bd12586138d

Merge "Cumulative security patch from commit ca68a8b561c48393c8ba25055ce294caaa3ac008" into m-wireless-dev

src/p2p/p2p.c

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 @@
 	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)) {