diff options
| author | Edwin Wong <edwinwong@google.com> | 2019-12-17 14:37:57 -0800 |
|---|---|---|
| committer | Edwin Wong <edwinwong@google.com> | 2020-01-08 16:08:40 -0800 |
| commit | d81917505eda818d64135a8226a529b3901dee4b (patch) | |
| tree | 87b5bba8ede0e6450906e62c18596dec8e30a357 | |
| parent | 7b254210fe701b9023d1db342c6d1c884d39efe7 (diff) | |
| download | frameworks_av-d81917505eda818d64135a8226a529b3901dee4b.tar.gz frameworks_av-d81917505eda818d64135a8226a529b3901dee4b.tar.bz2 frameworks_av-d81917505eda818d64135a8226a529b3901dee4b.zip | |
[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt
Fix destPtr was not pointing to destination raw pointer.
bug: 144506242
Test: sts
ANDROID_BUILD_TOP= ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242
Change-Id: Ifc9f3999e28c9216c476cab432248eb6c320de43
| -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(); |