commit 9f760865d70346e7e44c824eda3b57a16d20328d
author Bharath <bharath@teamb58.org> Tue May 09 22:59:12 2023 +0530
committer Bharath <bharath@teamb58.org> Tue May 09 22:59:12 2023 +0530
tree 3db67ef3d6890d695dc7a6fbc5a3f7f13e8f7545
parent bbda2df8e69a4ef801cf95a2a6d01e299181b9ea
parent 4115fb1c275be86eb720cbc72fc4285b86d622c5

Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  OOBR in AnalyzeMfcResp in NxpMfcReader.cc

Change-Id: I9a9a11d6da11a31b9e80b402e44ed93d7dae6ee5

halimpl/mifare/NxpMfcReader.cc

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