| commit | 5a95fef4c2c0f99f0a4244641140c4bda49d2f59 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Mar 03 23:37:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 23:37:17 2021 +0000 |
| tree | ca089b8a88740bfaa6b3d5007557dedf73447ae8 | |
| parent | 0fbf87918dc0607d81d3df47810e166565f39225 [diff] | |
| parent | 913bc4bf2751ca279199fe3a66c13be63b4ad1d8 [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 603a44d975 -s ours am: 913bc4bf27 -s ours am skip reason: Change-Id I6eee7a4b0960b767b6620c8b93dc252422c42f25 with SHA-1 6ee1f2d8f2 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611824 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4acac07c7c0e0903ce83375258debff8ccd38872
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(); }