| commit | 8c5cba487899179559911c1b7d310022be2f69d7 | [log] [tgz] |
|---|---|---|
| author | Rambo Wang <rambowang@google.com> | Wed Mar 10 02:50:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 10 02:50:58 2021 +0000 |
| tree | 2a6facb2dae5c08827b60a80316c5b6d968554bc | |
| parent | 8718ed41fb84456a247b929a5ababe0782f10f6c [diff] | |
| parent | 8ac3748c3b27dd4984a7979f6b7b3da8bae512d9 [diff] |
Merge "Deprecates obsoleted radio hal interfaces" am: 6e1ce4d3c9 am: 8ac3748c3b Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595306 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc4dd07e11684afa70d62692277f27091919a2da
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(); }