| commit | 4433ba3818f21a6c3702e92eb8c52d080c976ab1 | [log] [tgz] |
|---|---|---|
| author | David Zeuthen <zeuthen@google.com> | Mon Mar 08 20:09:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 08 20:09:58 2021 +0000 |
| tree | 2fb80af834d07b120cefbc3b2e3a2fcb8545cfba | |
| parent | 18d8a43a340363f690e6098ee95913245e64e5ea [diff] | |
| parent | 63145dcc791ae16558fa3b49839201af6efadcfa [diff] |
Merge "identity: Check freshness of verification token in TA." am: 9d746597e8 am: 63145dcc79 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1620179 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If33d7ce5f624dad83ebd78a5e509f6abcee6e8bb
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(); }