From b92e3bf778ab8dcf28193cfb63c40dd964644c47 Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Tue, 26 Nov 2019 17:52:52 -0800 Subject: [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. If the input SecureStopRelease size is less than sizeof(uint32_t) in releaseSecureStops(), an out of bound read will occur. bug: 144766455 bug: 144746235 bug: 147281068 Test: sts ANDROID_BUILD_TOP= ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455 Change-Id: Ibee5a105eaedfee37d2fa93f7024f63f30cc7409 --- drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drm') diff --git a/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp b/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp index d74bc53d8b..7cb5a38f35 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp +++ b/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp @@ -809,6 +809,11 @@ Return DrmPlugin::releaseSecureStops(const SecureStopRelease& ssRelease) // count - number of secure stops // list of fixed length secure stops size_t countBufferSize = sizeof(uint32_t); + if (input.size() < countBufferSize) { + // SafetyNet logging + android_errorWriteLog(0x534e4554, "144766455"); + return Status::BAD_VALUE; + } uint32_t count = 0; sscanf(reinterpret_cast(input.data()), "%04" PRIu32, &count); -- cgit v1.2.3