Commit: bcd4eaae518a8185726fd440fca9e3b6eee6a1ff - frameworks-av (git)

frameworks/av

Commit MetaInfo

• Revision: bcd4eaae518a8185726fd440fca9e3b6eee6a1ff (tree)
• Time: 2020-02-12 04:06:52
• Author: Edwin Wong <edwinwong@goog...>
• Commiter: android-build-team Robot

Log Message

[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: Ia1b8f755daaada2f1411abeb3cb5b832a72b3c82
(cherry picked from commit 8464bfa975afe360bb8e3dd59c036ce4a4995fa8)

Change Summary

• modified: drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp

Incremental Difference

--- 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();