| commit | 9c570e0cd3d6b771d64752bb30c7b3e41add0b65 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Mar 03 19:04:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 19:04:26 2021 +0000 |
| tree | a42ca4887cc285701824c4fffa25c8ff995aaad2 | |
| parent | f495c326a014499d00e40c39757fe241cf24188a [diff] | |
| parent | 37961ff47c837c5be6f13dfd1c892a7db34ec723 [diff] |
Merge "Memtrack HAL: Update documentation" am: 620ad1ca3f am: 37961ff47c Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611823 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5545dc26df7e9870003cd66cd63c171a1988fae3
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(); }