widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Protect against race conditions when adding a license"

Browse Source
This commit is contained in:
Rahul Frias
2022-01-24 22:33:48 +00:00
committed by Android (Google) Code Review
parent af99d774d4 84abb87fd8
commit 8500365f8c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -396,7 +396,16 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id,
return EMPTY_KEY_DATA_1; return EMPTY_KEY_DATA_1;
} }
const CdmResponseType sts = session->AddKey(key_data); CdmResponseType sts = KEY_ADDED;
{
// TODO(rfrias): Refactor. For now lock while adding keys to prevent
// a race condition between this and the decryption thread. This may
// occur if |policy_timers_| is reset when PolicyEngine::SetLicense
// is called.
std::unique_lock<std::recursive_mutex> lock(session_map_lock_);
sts = session->AddKey(key_data);
}
if (sts == KEY_ADDED) { if (sts == KEY_ADDED) {
if (session->is_release()) { if (session->is_release()) {
*license_type = kLicenseTypeRelease; *license_type = kLicenseTypeRelease;