| commit | 07395cf4542f3df60410cef775810561b1bccccf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 09 19:17:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 19:17:34 2021 +0000 |
| tree | a7338900f7e9e56c03defd230c91697f9f2cf287 | |
| parent | d81eb1330c4443dc221f0e46a03726b4a24df023 [diff] | |
| parent | 1fc4d53bd562a4c5bfaa5d68739bb351e4bffec1 [diff] |
Merge "Get Radio Hal Capabilities in VTS" am: 26629e8698 am: 1fc4d53bd5 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1622563 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaf24b76c9f97bc58080104f179bb59d742d0ad82
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(); }