| commit | e3ece4b500cfbf4ef3658013f02d550c1a9665b9 | [log] [tgz] |
|---|---|---|
| author | Michael Butler <butlermichael@google.com> | Wed Feb 24 01:45:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 24 01:45:18 2021 +0000 |
| tree | 876e31ff8b592aa5a9ff8897dcd09a55ddc9ede4 | |
| parent | 1d5b0a09d9aa25671447e0f1c29118925c0df49f [diff] | |
| parent | 0194425127dcb90c0fe87437630f55b2238f06e9 [diff] |
Make NNAPI countNumberOfConsumers return GeneralResult -- hal am: 68b6926e3c am: 0194425127 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1600093 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e40a46d2baa594189b66cb532e5a4c70511c961
diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp index 2db3607..e6d4e84 100644 --- a/drm/1.0/default/CryptoPlugin.cpp +++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -124,7 +124,11 @@ return Void(); } - if (source.offset + offset + source.size > sourceBase->getSize()) { + size_t totalSize = 0; + if (__builtin_add_overflow(source.offset, offset, &totalSize) || + __builtin_add_overflow(totalSize, source.size, &totalSize) || + totalSize > sourceBase->getSize()) { + android_errorWriteLog(0x534e4554, "176496160"); _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size"); return Void(); }