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

Prevent race conditions between decrypt and close session

Browse Source 
[ Merge of http://go/wvgerrit/47520 ]

Bug: 73781703
Test: WV unit/integration tests, GTS GtsMediaTestCases tests and AUPT tests.
Change-Id: I618ed8ca38855aecdb31e829a7f4041cbd505a02
This commit is contained in:
Rahul Frias
2018-04-13 01:12:16 -07:00
parent 5c71603e8c
commit 07bb4de042
6 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/include/cdm_session.h
View File

@@ -37,7 +37,7 @@ class CdmSession {
CdmSession(FileSystem* file_system, metrics::SessionMetrics* metrics);
virtual ~CdmSession();
void Close() { closed_ = true; }
void Close();
bool IsClosed() { return closed_; }
// Initializes this instance of CdmSession with the given property set.
@@ -263,6 +263,9 @@ class CdmSession {
bool mock_license_parser_in_use_;
bool mock_policy_engine_in_use_;
// Lock to avoid race conditions between Close() and Decrypt()
Lock close_lock_;
CORE_DISALLOW_COPY_AND_ASSIGN(CdmSession);
};

1
libwvdrmengine/cdm/core/include/wv_cdm_types.h
View File

@@ -333,6 +333,7 @@ enum CdmResponseType {
GET_PROVISIONING_METHOD_ERROR = 289,
SESSION_NOT_FOUND_17 = 290,
SESSION_NOT_FOUND_18 = 291,
SESSION_CLOSED_1 = 292,
};
enum CdmKeyStatus {

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

@@ -66,6 +66,11 @@ CdmSession::~CdmSession() {
}
}
void CdmSession::Close() {
AutoLock lock(close_lock_);
closed_ = true;
}
CdmResponseType CdmSession::Init(
CdmClientPropertySet* cdm_client_property_set) {
return Init(cdm_client_property_set, NULL, NULL);
@@ -567,10 +572,14 @@ CdmResponseType CdmSession::QueryOemCryptoSessionId(
// Decrypt() - Accept encrypted buffer and return decrypted data.
CdmResponseType CdmSession::Decrypt(const CdmDecryptionParameters& params) {
if (!initialized_) {
LOGE("CdmSession::Decrypt: not initialized");
return NOT_INITIALIZED_ERROR;
}
AutoLock lock(close_lock_);
if (IsClosed()) {
return SESSION_CLOSED_1;
}
// Playback may not begin until either the start time passes or the license
// is updated, so we treat this Decrypt call as invalid.
if (params.is_encrypted) {

2
libwvdrmengine/cdm/core/test/test_printers.cpp
View File

@@ -599,6 +599,8 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
break;
case SESSION_NOT_FOUND_18: *os << "SESSION_NOT_FOUND_18";
break;
case SESSION_CLOSED_1: *os << "SESSION_CLOSED_1";
break;
default:
*os << "Unknown CdmResponseType";
break;

1
libwvdrmengine/include/mapErrors-inl.h
View File

@@ -230,6 +230,7 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::SESSION_NOT_FOUND_10:
case wvcdm::SESSION_NOT_FOUND_17:
case wvcdm::SESSION_NOT_FOUND_18:
case wvcdm::SESSION_CLOSED_1:
return android::ERROR_DRM_SESSION_NOT_OPENED;
case wvcdm::SESSION_KEYS_NOT_FOUND:
return kSessionKeysNotFound;

1
libwvdrmengine/include_hidl/mapErrors-inl.h
View File

@@ -58,6 +58,7 @@ static Status mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::SESSION_NOT_FOUND_10:
case wvcdm::SESSION_NOT_FOUND_17:
case wvcdm::SESSION_NOT_FOUND_18:
case wvcdm::SESSION_CLOSED_1:
return Status::ERROR_DRM_SESSION_NOT_OPENED;
case wvcdm::DECRYPT_ERROR: