| commit | 18d8a43a340363f690e6098ee95913245e64e5ea | [log] [tgz] |
|---|---|---|
| author | Benjamin Schwartz <bsschwar@google.com> | Mon Mar 08 20:09:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 08 20:09:46 2021 +0000 |
| tree | 64fddac501c6e48bc32953144bcb363a880b53a4 | |
| parent | bc8ba8512a56df0a3fbf2dfc1660131e56d2f9af [diff] | |
| parent | e16ec55e9c614859bb4ae4c3bbd26ae31b3a8659 [diff] |
Merge "power/stats: Add OWNERS" am: 3de03047d3 am: e16ec55e9c Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621726 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1ed9d0060e9426ca26e27b27787c2dc0e5dfb2ab
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(); }