| commit | 21b21cc47a750a7a8bd706c1828d701187e90770 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 09 07:12:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 07:12:06 2021 +0000 |
| tree | 5090260042113807f93a40ce3440c5e6ec1cb8f7 | |
| parent | 361d57017b1b1cef645aa1ec92d9ecbd8b4b8b0a [diff] | |
| parent | 877bdc218bed95dc6cf28e87f3652a92d64afbcd [diff] |
Merge "vts: Correct the test RSA key format" am: ac85c24b77 am: 877bdc218b Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifdde0a8085bd34c6b7d5dade530b79bd76d82e7c
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(); }