| commit | d1ffb5c2e5e5e9f01c7aeedd25f399c2b5498709 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Mar 01 20:08:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 01 20:08:00 2021 +0000 |
| tree | 70c3818e89ed7a787948b88d48d584178a26487c | |
| parent | 3065a520effc86d663b0ad05583589c05d69e7a5 [diff] | |
| parent | 1832a8ce7862a690fd9bf40bdbf437f99cfc5f63 [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 19bca8173e am: 1832a8ce78 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611737 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I01fd296f9db2e5adc8b7aac8def3e5845457c115
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(); }