| commit | 8682b1bdcf1c280621392b78fab0d638fe3d7426 | [log] [tgz] |
|---|---|---|
| author | George Chang <georgekgchang@google.com> | Wed Jun 05 15:57:56 2019 +0800 |
| committer | Nikoli Cartagena <dargeren@google.com> | Mon Jun 10 14:53:09 2019 -0700 |
| tree | 2be49d2120929f17b02edcd0032921be3bf780af | |
| parent | 307f279ac64e08bc9989821b9b647afa02fb2f40 [diff] |
Prevent OOB write in Mfc_Transceive Bug: 132082342 Test: Manual test/ Mifare Tag Read/Write Merged-In: I3e1977514ba924655d42be4782244c6ef1cf7619 Change-Id: I3e1977514ba924655d42be4782244c6ef1cf7619 (cherry picked from commit 17520911466e678055319bbe946a264f7d323fbb)
diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c index d0a084e..411ec3a 100755 --- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c +++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c
@@ -1070,6 +1070,12 @@ 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;