Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b7bb9df0 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-8.1.0_r89' into staging/lineage-15.1_merge_android-security-8.1.0_r89 

Android Security 8.1.0 Release 89 (7269716)

* tag 'android-security-8.1.0_r89':
  [RESTRICT AUTOMERGE] Fix possible uaf of play policy state

Change-Id: I6955308fc329c0769d8814a81d1aeab10a02e144
parents 541acc4c 67a3859b

drm/mediadrm/plugins/clearkey/DrmPlugin.cpp

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ status_t DrmPlugin::queryKeyStatus( 
    }



    infoMap.clear();

    android::Mutex::Autolock lock(mPlayPolicyLock);

    for (size_t i = 0; i < mPlayPolicy.size(); ++i) {

        infoMap.add(mPlayPolicy.keyAt(i), mPlayPolicy.valueAt(i));

    }

drm/mediadrm/plugins/clearkey/DrmPlugin.h

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ public: 
private:

    void setPlayPolicy();



    android::Mutex mPlayPolicyLock;

    mutable android::Mutex mPlayPolicyLock;

    android::KeyedVector<android::String8, android::String8> mPlayPolicy;

    SessionLibrary* mSessionLibrary;