| commit | df027227fab196304f97707183183c7ac3d0bcfc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 02 02:08:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 02:08:40 2021 +0000 |
| tree | 98dae55ad6c666fbbc2a13ac4c41499db811495a | |
| parent | adb0da89b499ed1257ca17a6062fdc39598ca7a0 [diff] | |
| parent | 7541cff95fc10a6f26da3d17cfb373dde251b7c1 [diff] |
Merge "Fix VTS issue of BroadcastRadio v2.0" am: a66dbdefb5 am: 7541cff95f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611313 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9e3a9a5aa56d06627bf19d45632a6301ddd04277
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(); }