| commit | 88506e39b801cc134bc8361a4b9c602c6fc98202 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Fri Mar 05 07:44:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 07:44:56 2021 +0000 |
| tree | 073fba7305306283586a555ab2c7c8b8a2eb1445 | |
| parent | e7ed8eb6dd8901bcefeaaa47a8f0a72ffa74984e [diff] | |
| parent | 9c20468bc98141e5937dc079ecd6ca7a4e666499 [diff] |
Merge "Fix docs for SecurityLevel::TRUSTED_ENVIRONMENT" am: e88878c71d am: 9c20468bc9 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1614580 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I702f08820930eae7fe7aa8cead490df02a95b97d
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(); }