Android security 11.0.0 release 61

-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY2nKqwAKCRDorT+BmrEO
 eBc5AJ4wGakq3wasUnkFtbSD6uFHabU+DACfSKZqrZxEgXUt30hQqNxYXeMkang=
 =5MCK
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEA2skEMxbPHNb/U7LbZVRKTMRJykFAmNrBbIACgkQbZVRKTMR
 JymCaxAAlygQqZr7BJktbbo/+2x8PJoVQoitFjRiqGNhcyLhY3sR3Tkwd2GPdSo+
 MKepmPXhzD6an9FxWBg3nRQNNQ+O9GeNCTl9ui+I6l3IBgb80k/Wt8GEOsxuaWrl
 5HnPz2XKcVFWuCEuaIzm3WHcX7YGhl69ljAcH4V1LFtOqQsm2KAn/L7UVm+bIEr1
 tslfM4TmUqOOeOR4cPE8xnk/h3vp9kiSjLA/S2ck4Tpbf5K8P17JBgPK0sXuki6l
 EecyBnXW05EY5KnVWC1jYEW5lFLOfmGzKhLItZ5cEbCRpjZzJqfGMt4QMhiogyGG
 LW2t1vSFFUYJ0l/YO6VeqOF/IPBJW7e3BgeUvcuxjEkUF15Th15StQiVs+2uTy7c
 m2o/4x69BIHcOlMRlbOAsr3YOw4Uf35/kq+SA83iQX2diRQsZ27zq23ZK9XyKj9Z
 9eEwwwlllQP/Pox+ux7iJ+vGMdQ/HpAoGOPfa2R35nmQFrR4V93dUJz0CmWpmni2
 U9L1Y8Pbg5jnVB9rP+38dIyTIcRzVdAwkNvvaPlCoCZOckNDsyKn/uFZwO5wgkI/
 EHWGGm6cTUBwKb4KiOFRtKMRXp8w/hf/2bVFrJmstyHtNjue6HWAf6pGYV65zpdQ
 XxhMD3a9xeoR6YVzOrW4EX0xMLtJZ55+ab8+LaGP1YEo6hKkJvg=
 =Rr/h
 -----END PGP SIGNATURE-----

Merge tag 'android-security-11.0.0_r61' of https://android.googlesource.com/platform/frameworks/av into staging/lineage-18.1_merge_android-security-11.0.0_r61

Android security 11.0.0 release 61

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

Change-Id: Iff9819a3a41f8f766ac388c3e2de977cb26ab0aa

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

@@ -623,6 +623,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()) {
@@ -653,6 +654,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

@@ -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);
 };