Merge "DO NOT MERGE: wifinative jni: check array length for trackSignificantWifiChange" into lmp-mr1-dev

am: bb7d4b9c62

Change-Id: I2cd822a145406c65fa2ea21484c1a16aa4bb886c

1 files changed, 8 insertions, 2 deletions

diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index e9e85ac9d..4611d9e2f 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -34,6 +34,7 @@
 namespace android {
 
 static jint DBG = false;
+const int SAFE_NET_LOG_ID = 0x534e4554;
 
 static bool doCommand(JNIEnv* env, jstring javaCommand,
                       char* reply, size_t reply_len) {
@@ -628,7 +629,7 @@ static jboolean android_net_wifi_setHotlist(
     if (params.num_ap >
             static_cast<int>(sizeof(params.ap) / sizeof(params.ap[0]))) {
         ALOGE("setHotlist array length is too long");
-        android_errorWriteLog(0x534e4554, "31856351");
+        android_errorWriteLog(SAFE_NET_LOG_ID, "31856351");
         return false;
     }
 
@@ -749,7 +750,12 @@ static jboolean android_net_wifi_trackSignificantWifiChange(
         ALOGE("Error in accessing array");
         return false;
     }
-
+    if (params.num_ap >
+        static_cast<int>(sizeof(params.ap) / sizeof(params.ap[0]))) {
+        ALOGE("trackSignificantWifiChange array length is too long");
+        android_errorWriteLog(SAFE_NET_LOG_ID, "37775935");
+        return false;
+    }
     ALOGD("Initialized common fields %d, %d, %d, %d", params.rssi_sample_size,
             params.lost_ap_sample_size, params.min_breaching, params.num_ap);