summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNingyuan Wang <nywang@google.com>2016-10-11 11:42:12 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-12-09 11:00:02 -0800
commitc579cce67bbb8d0a64b58b3b89d53ae1bce330e9 (patch)
tree0324ef91d4279f9f4e75bf1ec1c4b9d2406de8f0
parentd8748b8faf9c002b59e059d52d49fcc5b7ca5887 (diff)
downloadandroid_frameworks_opt_net_wifi-stable/cm-13.0-ZNH0E.tar.gz
android_frameworks_opt_net_wifi-stable/cm-13.0-ZNH0E.tar.bz2
android_frameworks_opt_net_wifi-stable/cm-13.0-ZNH0E.zip
resolve merge conflicts of 849c5c7 to mnc-devstable/cm-13.0-ZNH0E
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. CYNGNOS-3312 Bug: 31856351 Test: compile, unit tests, manual test Change-Id: I194850a4c79ddf478d98e750f65b24e82d99ebc0
-rw-r--r--service/jni/com_android_server_wifi_WifiNative.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index dc0aad05f..4a08b8cc6 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -892,7 +892,7 @@ static jboolean android_net_wifi_setHotlist(
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");