commit 35f34f4d016cc693507e8036ceaf37c99db76837
author Alisher Alikhodjaev <alisher@google.com> Thu Apr 15 19:06:47 2021 -0700
committer Alisher Alikhodjaev <alisher@google.com> Thu Apr 15 19:12:52 2021 -0700
tree ed03182223efb3c290e596d44ea3cde3f2eddfd0
parent 041e19dd25403d6d8633bcc2519c45fdaf42bc2a

Out of bounds read in hal_core_initialized

Bug: 176446340
Test: build and run
Change-Id: I02f93750e590b2384f79580dd7c06fc06f46a4ca

nfc/1.0/default/Nfc.cpp

diff --git a/nfc/1.0/default/Nfc.cpp b/nfc/1.0/default/Nfc.cpp
index fcdcbbc..a1e50f0 100644
--- a/nfc/1.0/default/Nfc.cpp
+++ b/nfc/1.0/default/Nfc.cpp
@@ -38,7 +38,7 @@
 ::android::hardware::Return<NfcStatus> Nfc::coreInitialized(const hidl_vec<uint8_t>& data)  {
     hidl_vec<uint8_t> copy = data;
 
-    if (mDevice == nullptr) {
+    if (mDevice == nullptr || copy.size() == 0) {
         return NfcStatus::FAILED;
     }
     int ret = mDevice->core_initialized(mDevice, &copy[0]);