commit a8bfe75958bca32db6f3dbe534a66cfd168c4f8a
author Dennis Jeon <dennis.jeon@broadcom.corp-partner.google.com> Tue Dec 20 19:55:19 2022 +0900
committer chenpaul <chenpaul@google.com> Thu Dec 29 09:17:37 2022 +0800
tree 99a47e1c9540912ae5e54eb3e47216244176ce55
parent 15500502b794953e025f7543b3bb1b0ed5aecf87

Fixed OOB read/write possible when len equals sizeof array

OOB read/write possible in get_svc_hash() since it convert character until the string meets null terminated
Added null terminated character before calling it.

Bug: 261857862
Test: Checked with lldb

Change-Id: Id998c69ca1dccbd3108c2e78f065521cdac45135
Signed-off-by: Dennis Jeon <dennis.jeon@broadcom.corp-partner.google.com>

bcmdhd/wifi_hal/nan.cpp

diff --git a/bcmdhd/wifi_hal/nan.cpp b/bcmdhd/wifi_hal/nan.cpp
index 2dadaf8..7ac1be8 100755
--- a/bcmdhd/wifi_hal/nan.cpp
+++ b/bcmdhd/wifi_hal/nan.cpp
@@ -702,6 +702,8 @@
 
         if (mParams->service_name_len) {
             u8 svc_hash[NAN_SVC_HASH_SIZE];
+            u16 len = min(mParams->service_name_len, sizeof(mParams->service_name) - 1);
+            mParams->service_name[len] = '\0';
 
             result = get_svc_hash(mParams->service_name, mParams->service_name_len,
                     svc_hash, NAN_SVC_HASH_SIZE);
@@ -1066,6 +1068,8 @@
 
         if (mParams->service_name_len) {
             u8 svc_hash[NAN_SVC_HASH_SIZE];
+            u16 len = min(mParams->service_name_len, sizeof(mParams->service_name) - 1);
+            mParams->service_name[len] = '\0';
 
             result = get_svc_hash(mParams->service_name, mParams->service_name_len,
                     svc_hash, NAN_SVC_HASH_SIZE);
@@ -5429,6 +5433,9 @@
 #endif /* CONFIG_BRCM */
     counters.dp_req++;
     if (msg->service_name_len) {
+        u16 len = min(msg->service_name_len, sizeof(msg->service_name) - 1);
+        msg->service_name[len] = '\0';
+
         if (strncmp(NAN_OOB_INTEROP_SVC_NAME,
                     (char*)msg->service_name, msg->service_name_len) == 0) {
             ALOGI("Use Hardcoded svc_hash\n");
@@ -5514,6 +5521,9 @@
 #endif /* CONFIG_BRCM */
     counters.dp_resp++;
     if (msg->service_name_len) {
+        u16 len = min(msg->service_name_len, sizeof(msg->service_name) - 1);
+        msg->service_name[len] = '\0';
+
         if (strncmp(NAN_OOB_INTEROP_SVC_NAME,
                     (char*)msg->service_name, msg->service_name_len) == 0) {
             ALOGI("Use Hardcoded svc_hash\n");