commit 67e9823cf953f055d70461c757c3f42e63cb4175
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 28 18:51:29 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 28 18:51:29 2023 +0000
tree f2117a31825919ccd03926db4b331fc1503d834f
parent 31a11b9e9fe6bc8a08c3edb81c56600a91778558
parent 457a81e2e4c04f0394f2053feda08f60cf3e6dc2

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21680607'] into tm-qpr2-release.

Change-Id: I9da2961b40d275a4a0175bfd3be99b772b6ba0ce

pn8x/halimpl/mifare/NxpMfcReader.cc

diff --git a/pn8x/halimpl/mifare/NxpMfcReader.cc b/pn8x/halimpl/mifare/NxpMfcReader.cc
index 602a2b7..9ee49db 100644
--- a/pn8x/halimpl/mifare/NxpMfcReader.cc
+++ b/pn8x/halimpl/mifare/NxpMfcReader.cc
@@ -349,6 +349,10 @@
       } break;
 
       case eMfcAuthRsp: {
+        if (*pBufflen < 2) {
+          status = NFCSTATUS_FAILED;
+          break;
+        }
         /* check the status byte */
         if (NFCSTATUS_SUCCESS == pBuff[1]) {
           status = NFCSTATUS_SUCCESS;

snxxx/halimpl/mifare/NxpMfcReader.cc

diff --git a/snxxx/halimpl/mifare/NxpMfcReader.cc b/snxxx/halimpl/mifare/NxpMfcReader.cc
index ac0a0c3..7a2f46d 100644
--- a/snxxx/halimpl/mifare/NxpMfcReader.cc
+++ b/snxxx/halimpl/mifare/NxpMfcReader.cc
@@ -383,6 +383,10 @@
       } break;
 
       case eMfcAuthRsp: {
+        if (*pBufflen < 2) {
+          status = NFCSTATUS_FAILED;
+          break;
+        }
         /* check the status byte */
         if (NFCSTATUS_SUCCESS == pBuff[1]) {
           status = NFCSTATUS_SUCCESS;