| commit | 1d5b0a09d9aa25671447e0f1c29118925c0df49f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 23 15:56:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 15:56:33 2021 +0000 |
| tree | c6ac17e5b6f8d219a5c1005c72569daea0f44e46 | |
| parent | 17b1890491213f9366f6ae91a7b628193fe03e95 [diff] | |
| parent | 736a899c8553d051b677fd06169fdc8c7d5f193a [diff] |
Merge "Non ABI changes to neuralnetworks HAL" am: eff68753f9 am: 736a899c85 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1599275 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I77b2b285e8ec4ae652338f092ad8aed400bafaea
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(); }