commit 5190732f88a2e097e6f09eede180cab1d0a2ecc7
author android-build-team Robot <android-build-team-robot@google.com> Wed Jan 13 23:46:10 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jan 13 23:46:10 2021 +0000
tree febf1e1486f651dd57f4060d5b94ac677ec0eb6c
parent be95c744b71041c3d6fdb8d02eaaec275f22ed2e
parent 67bdc902fb8aef582a4c90dd3c4bd3ab5ae0efde

Snap for 7080740 from 67bdc902fb8aef582a4c90dd3c4bd3ab5ae0efde to mainline-resolv-release

Change-Id: If91b15bb40dd6eb3074a2800a273508a8b4831a4

src/p2p/p2p.c

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 9c73885..1dc5b92 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -8,6 +8,7 @@
 
 #include "includes.h"
 
+#include <log/log.h>
 #include "common.h"
 #include "eloop.h"
 #include "common/defs.h"
@@ -453,6 +454,10 @@
 	dev->info.config_methods = cli->config_methods;
 	os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
 	dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
+	if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN) {
+		android_errorWriteLog(0x534e4554, "172937525");
+		dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN;
+	}
 	os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
 		  dev->info.wps_sec_dev_type_list_len);
 }