diff options
| author | Edwin Wong <edwinwong@google.com> | 2019-09-25 12:15:37 -0700 |
|---|---|---|
| committer | Edwin Wong <edwinwong@google.com> | 2020-03-06 18:24:41 +0000 |
| commit | 9b7a9fcfa3051d116a19f25368fccd4a623fe72d (patch) | |
| tree | da856c1ebf642077fb486121a94f7313252cccb1 /drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h | |
| parent | a6544e3bf7de17f104d5fb509d6cb7f6d90dc79f (diff) | |
| download | frameworks_av-9b7a9fcfa3051d116a19f25368fccd4a623fe72d.tar.gz frameworks_av-9b7a9fcfa3051d116a19f25368fccd4a623fe72d.tar.bz2 frameworks_av-9b7a9fcfa3051d116a19f25368fccd4a623fe72d.zip | |
[DO NOT MERGE] Fix Heap use after free in clearkey getSecureStops
Security Vulnerability fix: Heap use after free in getSecureStops
in android.hardware.drm@1.1-service.clearkey
Test: adb shell ps | grep clearkey
pid ID does not change after running drmpoc
Test: sts
ANDROID_BUILD_TOP= ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_07#testPocBug_137878930
bug: 137878930
Merged-In: I78b2dc2bccde238a06398b3733cea8e574ea8ee7
Change-Id: I4fa2f0ad3f3360812987223f507a7394357080b3
Diffstat (limited to 'drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h')
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h b/drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h index f294d4d736..3de758945b 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h +++ b/drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h @@ -416,6 +416,7 @@ private: } DeviceFiles mFileHandle; + Mutex mSecureStopLock; CLEARKEY_DISALLOW_COPY_AND_ASSIGN_AND_NEW(DrmPlugin); }; |