diff options
| author | Edwin Wong <edwinwong@google.com> | 2020-01-23 20:59:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-23 20:59:20 +0000 |
| commit | ac8a248341036148913169438fa362afc86cbc08 (patch) | |
| tree | 8766be1e17957d99c0245873f99f7ae3055aab5d /drm | |
| parent | 94ac050b2fd4f4af21003d7bd57c0a572a9afe36 (diff) | |
| parent | 8464bfa975afe360bb8e3dd59c036ce4a4995fa8 (diff) | |
| download | frameworks_av-ac8a248341036148913169438fa362afc86cbc08.tar.gz frameworks_av-ac8a248341036148913169438fa362afc86cbc08.tar.bz2 frameworks_av-ac8a248341036148913169438fa362afc86cbc08.zip | |
Merge "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt" into qt-qpr1-dev
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp b/drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp index f164f2859b..3ecf6d5acd 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp +++ b/drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp @@ -136,6 +136,8 @@ Return<void> CryptoPlugin::decrypt_1_2( return Void(); } + base = static_cast<uint8_t *>(static_cast<void *>(destBase->getPointer())); + if (destBuffer.offset + destBuffer.size > destBase->getSize()) { _hidl_cb(Status_V1_2::ERROR_DRM_FRAME_TOO_LARGE, 0, "invalid buffer size"); return Void(); |