diff options
| author | Ningyuan Wang <nywang@google.com> | 2016-10-11 11:42:12 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-12-08 19:16:15 -0800 |
| commit | 83ff6f1c0c33986c512d5dffb2754dc276725d00 (patch) | |
| tree | 8f0a904d809a388273fc88caf1234fcb4c3560d8 | |
| parent | 84e1cda5b2b81ba9b07cb228cd20cda8a93aa492 (diff) | |
| download | android_frameworks_opt_net_wifi-83ff6f1c0c33986c512d5dffb2754dc276725d00.tar.gz android_frameworks_opt_net_wifi-83ff6f1c0c33986c512d5dffb2754dc276725d00.tar.bz2 android_frameworks_opt_net_wifi-83ff6f1c0c33986c512d5dffb2754dc276725d00.zip | |
resolve merge conflicts of 849c5c7 to mnc-devstable/cm-13.0-ZNH2K
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.cpp | 2 |
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"); |