commit 79f25156e03e148b1eec3031b0d8d8cdf5a9e8ab
author George Chang <georgekgchang@google.com> Wed Jun 05 15:53:25 2019 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 12 09:55:41 2019 +0000
tree 00a4bfa7db92fe334feda84ab53a3194baeb67aa
parent bfa3d8c969fcd581b9a3e317fb9e8d84b5f7e3b5

Prevent OOB write in Mfc_Transceive

Bug: 132082342
Test: Manual test/ Mifare Tag Read/Write
Exempt-From-Owner-Approval: Old Owners are all transferred to another BU
Change-Id: I3e1977514ba924655d42be4782244c6ef1cf7619
(cherry picked from commit 130a144ee6324a0c433c6b671448c0d14bf2dde1)

nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp

diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
index a950eb3..5ce5844 100644
--- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
+++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
@@ -994,6 +994,11 @@
   NFCSTATUS status = NFCSTATUS_FAILED;
   uint8_t i = 0x00;
 
+  if (len == 0) {
+    android_errorWriteLog(0x534e4554, "132082342");
+    return status;
+  }
+
   gphNxpExtns_Context.RawWriteCallBack = false;
   gphNxpExtns_Context.CallBackMifare = NULL;
   gphNxpExtns_Context.CallBackCtxt = NdefMap;