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

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

Merge tag 'android-security-10.0.0_r72' of... 

Merge tag 'android-security-10.0.0_r72' of https://android.googlesource.com/platform/frameworks/av into staging/lineage-17.1_merge_android-security-10.0.0_r72

Android security 10.0.0 release 72

* tag 'android-security-10.0.0_r72' of https://android.googlesource.com/platform/frameworks/av:
  RESTRICT AUTOMERGE - [Fix vulnerability] setSecurityLevel in clearkey

Change-Id: I04573e2db5d80144b0d9172924cf3ccd9cc8e479
parents bf9c8f48 d7b34932

drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp

+2 −0
Original line number Diff line number Diff line
@@ -612,6 +612,7 @@ Return<void> DrmPlugin::getSecurityLevel(const hidl_vec<uint8_t>& sessionId, 
        return Void();

    }



    Mutex::Autolock lock(mSecurityLevelLock);

    std::map<std::vector<uint8_t>, SecurityLevel>::iterator itr =

            mSecurityLevel.find(sid);

    if (itr == mSecurityLevel.end()) {
@@ -642,6 +643,7 @@ Return<Status> DrmPlugin::setSecurityLevel(const hidl_vec<uint8_t>& sessionId, 
        return Status::ERROR_DRM_SESSION_NOT_OPENED;

    }



    Mutex::Autolock lock(mSecurityLevelLock);

    std::map<std::vector<uint8_t>, SecurityLevel>::iterator itr =

            mSecurityLevel.find(sid);

    if (itr != mSecurityLevel.end()) {

drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h

+3 −1
Original line number Diff line number Diff line
@@ -398,7 +398,8 @@ private: 
    std::map<std::string, std::string> mStringProperties;

    std::map<std::string, std::vector<uint8_t> > mByteArrayProperties;

    std::map<std::string, std::vector<uint8_t> > mReleaseKeysMap;

    std::map<std::vector<uint8_t>, SecurityLevel> mSecurityLevel;

    std::map<std::vector<uint8_t>, SecurityLevel> mSecurityLevel

        GUARDED_BY(mSecurityLevelLock);

    sp<IDrmPluginListener> mListener;

    sp<IDrmPluginListener_V1_2> mListenerV1_2;

    SessionLibrary *mSessionLibrary;
@@ -419,6 +420,7 @@ private: 
    DeviceFiles mFileHandle GUARDED_BY(mFileHandleLock);

    Mutex mFileHandleLock;

    Mutex mSecureStopLock;

    Mutex mSecurityLevelLock;



    CLEARKEY_DISALLOW_COPY_AND_ASSIGN_AND_NEW(DrmPlugin);

};