| commit | 92d4d99b989363a8c566fb334a41fb9f97975fa1 | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Thu Feb 04 00:39:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 04 00:39:48 2021 +0000 |
| tree | 0711ed677684c877bb1e25145fd7bb87c47dc070 | |
| parent | cf0e945ac2a3014499613cc983e527d66e8cac73 [diff] | |
| parent | e289b4aa839a1bdfd2c9a25a0e8e11b76f81da4b [diff] |
Fix potential decrypt src pointer overflow. am: c14f262876 am: 107233b3dd am: e289b4aa83 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13472562 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I670648e6ef343ad17c332c44ac9c5a2f29f9071c
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(); }