mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 05:35:54 +00:00
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
|
From a1370bd00c106e4d172dc68638778fa111f6ecbe Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ian Hua <ianhua@google.com>
|
||
|
|
Date: Thu, 6 Jul 2023 10:05:36 +0000
|
||
|
|
Subject: [PATCH] Fix out of Bounds Read in convertSubgraphFromHAL in
|
||
|
|
ShimConverter.cpp in libneuralnetworks_shim_static
|
||
|
|
|
||
|
|
Bug: 269270167
|
||
|
|
Test: N/A
|
||
|
|
(cherry picked from commit 4bf7bb6b50b412678a681d29f7ced70a4d737762)
|
||
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:244ac21307a785d49930d4c7e289b74856fa9647)
|
||
|
|
Merged-In: I33272284b965efcbb531f64cbf838a0d59c28e00
|
||
|
|
Change-Id: I33272284b965efcbb531f64cbf838a0d59c28e00
|
||
|
|
---
|
||
|
|
shim_and_sl/ShimConverter.cpp | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/shim_and_sl/ShimConverter.cpp b/shim_and_sl/ShimConverter.cpp
|
||
|
|
index 1ed0e31cf..4830c5d05 100644
|
||
|
|
--- a/shim_and_sl/ShimConverter.cpp
|
||
|
|
+++ b/shim_and_sl/ShimConverter.cpp
|
||
|
|
@@ -150,6 +150,10 @@ ANeuralNetworksModel* convertSubgraphFromHAL(
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
case OperandLifeTime::CONSTANT_POOL: {
|
||
|
|
+ if (operand.location.poolIndex >= memoryPools.size()) {
|
||
|
|
+ *errorStatus = ErrorStatus::INVALID_ARGUMENT;
|
||
|
|
+ return nullptr;
|
||
|
|
+ }
|
||
|
|
resultModel.setOperandValueFromMemory(
|
||
|
|
i, memoryPools[operand.location.poolIndex].get(), operand.location.offset,
|
||
|
|
operand.location.length);
|