| commit | 3cf408ed724b094131544c675cc6dfb1f7e214b0 | [log] [tgz] |
|---|---|---|
| author | Jooyung Han <jooyung@google.com> | Tue Mar 02 03:07:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 03:07:14 2021 +0000 |
| tree | 9b7d04982295cb9b76bfeef299aff919709aecac | |
| parent | df027227fab196304f97707183183c7ac3d0bcfc [diff] | |
| parent | 78a02a2f4efe5f6ee4f708faaf37da50a569bf3d [diff] |
Merge "neuralnetworks: fix out ParcelFileDescriptor" am: 1f37668552 am: 78a02a2f4e Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1607935 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6f08ddd4216314cf474cb32723e2cc4300959b1c
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(); }