| commit | 1165b395c4f0de00b49d40c241d30166e9a98f9c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Mar 03 00:53:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 00:53:12 2021 +0000 |
| tree | 12134a3520fd3c4bc37d132ceeb976963addafd3 | |
| parent | 355ebd8f8922dbe3cbba4beb64e8aa3cfd871409 [diff] | |
| parent | 8138ebc7c09f9605495a410284d5fbaabfcd86e5 [diff] |
Merge "Add VtsHalNeuralnetworksTargetTest to NNAPI test mapping" am: 5ae082aad5 am: 8138ebc7c0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1612122 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idc9c98ad6b6215deb03da3df57113c5b53d5f018
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(); }