commit 56a1bacc37e755abe60d90a9282c48ee952f97c0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 10 03:01:35 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 10 03:01:35 2021 +0000
tree 4f4a3583f4bb2fde3ea7905c774f30bf8f8044c4
parent 528ee194626270329b1c482cd7bd7502d01bcd1f
parent 99e17ccd57b55033f8f97f1731c020e1f8cc5657

Merge cherrypicks of [15800618, 15800895, 15800896, 15800898, 15800900, 15800902, 15800904, 15800906, 15800675, 15800677, 15800968, 15800798, 15800799, 15800801] into security-aosp-rvc-release

Change-Id: Iadf67b869e5130e0535e32703b4ec0a69ebc9838

halimpl/hal/phNxpNciHal_ext.cc

diff --git a/halimpl/hal/phNxpNciHal_ext.cc b/halimpl/hal/phNxpNciHal_ext.cc
index a9c88a8..2837a7b 100644
--- a/halimpl/hal/phNxpNciHal_ext.cc
+++ b/halimpl/hal/phNxpNciHal_ext.cc
@@ -268,6 +268,11 @@
       icode_send_eof = 0;
     }
     if (nxpncihal_ctrl.nci_info.nci_version != NCI_VERSION_2_0) {
+      if (*p_len <= (p_ntf[2] + 2)) {
+        android_errorWriteLog(0x534e4554, "181660091");
+        NXPLOG_NCIHAL_E("length error!");
+        return NFCSTATUS_FAILED;
+      }
       if (p_ntf[p_ntf[2] + 2] == 0x00) {
         NXPLOG_NCIHAL_D("> Going through workaround - data of ISO 15693");
         p_ntf[2]--;
@@ -284,8 +289,8 @@
     icode_send_eof = 0;
   } else if (*p_len == 4 && p_ntf[0] == 0x40 && p_ntf[1] == 0x02 &&
              p_ntf[2] == 0x01 && p_ntf[3] == 0x06) {
-    NXPLOG_NCIHAL_D("> Deinit workaround for LLCP set_config 0x%x 0x%x 0x%x",
-                    p_ntf[21], p_ntf[22], p_ntf[23]);
+    /* NXPLOG_NCIHAL_D("> Deinit workaround for LLCP set_config 0x%x 0x%x 0x%x",
+                    p_ntf[21], p_ntf[22], p_ntf[23]); */
     p_ntf[0] = 0x40;
     p_ntf[1] = 0x02;
     p_ntf[2] = 0x02;