diff --git a/external/wpa_supplicant_8/src/p2p/p2p.c b/external/wpa_supplicant_8/src/p2p/p2p.c
index 7d4a03c57e..28c3aa00f7 100644
--- a/external/wpa_supplicant_8/src/p2p/p2p.c
+++ b/external/wpa_supplicant_8/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)) {