| commit | 957c8d2a3626e2be71f880c0be467a6c9c76b6d5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 02 03:07:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 03:07:42 2021 +0000 |
| tree | a0f9bb2dff4e9d9e4b5c73fefe182847ea7524ec | |
| parent | e198860c27621b790665e9aa281ad08395d3e4cb [diff] | |
| parent | 6ee1f2d8f28a4aefc8f35463afe8f7e2ff2df974 [diff] |
Merge "Explictly disallow LTE_CA as a RAT type" am: 81fcfa6295 am: 6ee1f2d8f2 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611604 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29e9afb6cb825912964519a6f7c23009a86388e6
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(); }