| commit | bc8ba8512a56df0a3fbf2dfc1660131e56d2f9af | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 05 23:30:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 23:30:50 2021 +0000 |
| tree | c33ffc2f5b451fd3b0012660b0b5bd11be1ace79 | |
| parent | 88506e39b801cc134bc8361a4b9c602c6fc98202 [diff] | |
| parent | b010404e425df10efb515be1995702cfc3cea985 [diff] |
Merge "Remove HIDL memtrack hal from compatibility matrix" am: 35d61d4cb1 am: b010404e42 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1619823 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia4dab98858c6beb7a3b65206f56c963ef9ab5a75
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(); }