| commit | 5df8053163beba7d76e95432fea1c406d1ee8f89 | [log] [tgz] |
|---|---|---|
| author | Amy Zhang <amyjojo@google.com> | Tue Mar 09 21:50:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 21:50:02 2021 +0000 |
| tree | 9ea0a4e334e4b276edac37aa08b97dcd0df4bbf7 | |
| parent | 07395cf4542f3df60410cef775810561b1bccccf [diff] | |
| parent | 4448d5ff1e6ebdf7e9be8a9433d62a7a2e6520bc [diff] |
Merge "Make the tv tuner hal use libdmabufheap instead of libion" am: 5001056e0f am: 4448d5ff1e Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1610134 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaff4ffcdfc15b5bdcd485ac69a07f3466ae99208
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(); }