| commit | 3065a520effc86d663b0ad05583589c05d69e7a5 | [log] [tgz] |
|---|---|---|
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | Mon Mar 01 13:58:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 01 13:58:44 2021 +0000 |
| tree | 618aa55341097367151e1ec716956a81e77f659f | |
| parent | 2f667a03842b2ecbdba8df094f2e6e9052c66882 [diff] | |
| parent | 20692ef8f304ca07f680b52becd685bdd6f8df3c [diff] |
Merge "Make com.android.common visible by neuralnetworks apex." am: d8541611d7 am: 20692ef8f3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584983 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I91ba12b00353fff4d32234ad39debae52577846b
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(); }