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