commit 513e6158d0161548372c9aa250330ddcf356f48b
author David Drysdale <drysdale@google.com> Tue Jan 25 09:46:45 2022 +0000
committer Armelle Laine <armellel@google.com> Thu Jun 09 06:00:40 2022 +0000
tree 4677b055721e533fa1567778258f4590bcf2850d
parent 9355fadefa5ab9c9fbae6f074e2dc9cdd8e8052f

Catch more allocation failure cases

Bug: 216213939
Bug: 215451239
Test: VtsAidlKeyMintTargetTest
Ignore-AOSP-First: Cherry pick from AOSP
Change-Id: I604c980dba7644e4012a358b6f2dc204cb215c3c
(cherry picked from commit 01d2e13c563a82e5cb0dc1adacd0ca5b41322497)

ng/AndroidRemotelyProvisionedComponentDevice.cpp

diff --git a/ng/AndroidRemotelyProvisionedComponentDevice.cpp b/ng/AndroidRemotelyProvisionedComponentDevice.cpp
index 0c2d842..54ea70c 100644
--- a/ng/AndroidRemotelyProvisionedComponentDevice.cpp
+++ b/ng/AndroidRemotelyProvisionedComponentDevice.cpp
@@ -113,6 +113,9 @@
     request.test_mode = testMode;
     request.num_keys = keysToSign.size();
     request.keys_to_sign_array = new (std::nothrow) KeymasterBlob[keysToSign.size()];
+    if (request.keys_to_sign_array == nullptr) {
+        return km_utils::kmError2ScopedAStatus(KM_ERROR_MEMORY_ALLOCATION_FAILED);
+    }
     for (size_t i = 0; i < keysToSign.size(); i++) {
         request.SetKeyToSign(i, keysToSign[i].macedKey.data(), keysToSign[i].macedKey.size());
     }