commit 15369165c8bcf1cc87778b4cad0f4d9fe83bf9aa
author Bharath <bharath@teamb58.org> Fri Jan 19 19:54:14 2024 +0530
committer Bharath <bharath@teamb58.org> Fri Jan 19 19:54:14 2024 +0530
tree 05946b364b739f0daeb6cecd200335b909812909
parent 8c49c841714e7b95a1525ac0448f3286113fc56b
parent 0857e1eb2660477404558c556a2e4e28c6274162

Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Fix OOB Read in convertSubgraphFromHAL

Change-Id: Ia90b745b25049c2dff8daad160ed77edcd1a2401

shim_and_sl/ShimConverter.cpp

diff --git a/shim_and_sl/ShimConverter.cpp b/shim_and_sl/ShimConverter.cpp
index 4830c5d..9914af1 100644
--- a/shim_and_sl/ShimConverter.cpp
+++ b/shim_and_sl/ShimConverter.cpp
@@ -51,6 +51,10 @@
         size_t subgraphIndex, const std::vector<uint8_t>& copiedOperandValues,
         ErrorStatus* errorStatus) {
     *errorStatus = ErrorStatus::NONE;
+    if (allModels == nullptr || subgraphIndex >= (*allModels).size()) {
+        *errorStatus = ErrorStatus::INVALID_ARGUMENT;
+        return nullptr;
+    }
     if ((*allModels)[subgraphIndex].has_value()) {
         return (*allModels)[subgraphIndex]->getHandle();
     }