| commit | 4b4a5e62da9f6b5d3624e912c74ec182dff0ae02 | [log] [tgz] |
|---|---|---|
| author | Michael Butler <butlermichael@google.com> | Wed Feb 24 01:45:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 24 01:45:20 2021 +0000 |
| tree | 0e165c2ffa787d97992d18743918c387cff0a283 | |
| parent | e3ece4b500cfbf4ef3658013f02d550c1a9665b9 [diff] | |
| parent | 734a2b401d2b6630a0d6fe07e56db7a6cbcb1ca4 [diff] |
Merge changes from topic "nnapi-numberOfConsumers" am: 65de531533 am: 734a2b401d Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1600094 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I68a7bc3a61e1c3730882a294589983528e9c176e
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(); }