commit 41c9e498901f19413ef97398d486577d1f1ecb28
author Ningyuan Wang <nywang@google.com> Tue Oct 11 11:42:12 2016 -0700
committer Liisa Anttonen <liisa.anttonen@nedevicesw.com> Fri Dec 23 12:53:02 2016 +0200
tree 529b2c2ef7f6783092af3e5d23ecd3447db7466e
parent dc254cffc064353634d2823df529946f956a8082

resolve merge conflicts of 849c5c7 to mnc-dev

This resovles the merge conflict for ag/1514448/
After Android M, this function uses num_bssid instead of num_ap.
Both are prone to stack overflow attacks.

Bug: 31856351
Test: compile, unit tests, manual test

Change-Id: I194850a4c79ddf478d98e750f65b24e82d99ebc0

service/jni/com_android_server_wifi_WifiNative.cpp

diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index 9fad557..f3dfe43 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -887,7 +887,7 @@
         return false;
     }
 
-    if (params.num_ap >
+    if (params.num_bssid >
             static_cast<int>(sizeof(params.ap) / sizeof(params.ap[0]))) {
         ALOGE("setHotlist array length is too long");
         android_errorWriteLog(0x534e4554, "31856351");