commit 91b48957b3ed7f8292f08b49379096ee432d63de
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 10 22:15:13 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 10 22:15:13 2023 +0000
tree 9f2b799ae2fcbb9f26ffc9e6faa3eb694392997b
parent 7eaf4de827be2e986212a94c200e2e49e07647bf
parent de5ae77a1d74211fc77d1f4fdd4750c4983863bd

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21680607'] into sc-v2-platform-release.

Change-Id: I9a54fed04d964cfe1ea94e5bc73df452a4b0785f

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 83fe1d9..7ac930b 100644
--- a/snxxx/halimpl/mifare/NxpMfcReader.cc
+++ b/snxxx/halimpl/mifare/NxpMfcReader.cc
@@ -353,6 +353,10 @@
       } break;
 
       case eMfcAuthRsp: {
+        if (*pBufflen < 2) {
+          status = NFCSTATUS_FAILED;
+          break;
+        }
         /* check the status byte */
         if (NFCSTATUS_SUCCESS == pBuff[1]) {
           status = NFCSTATUS_SUCCESS;