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

am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere

Browse Source 
* commit 'e5d4a0be30bac8fdba7194841084dcf61be6e8a2':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
This commit is contained in:
Jeff Tinker
2015-08-21 15:34:51 +00:00
committed by Android Git Automerger
parent 802fe3b35c e5d4a0be30
commit bcf3a11f0f
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ enum CdmResponseType {
NEED_PROVISIONING, NEED_PROVISIONING,
DEVICE_REVOKED, DEVICE_REVOKED,
INSUFFICIENT_CRYPTO_RESOURCES, INSUFFICIENT_CRYPTO_RESOURCES,
SECURE_BUFFER_REQUIRED,
}; };
#define CORE_DISALLOW_COPY_AND_ASSIGN(TypeName) \ #define CORE_DISALLOW_COPY_AND_ASSIGN(TypeName) \

4
libwvdrmengine/cdm/core/src/crypto_session.cpp
View File

@@ -647,6 +647,10 @@ CdmResponseType CryptoSession::Decrypt(const CdmDecryptionParameters& params) {
buffer_descriptor.type = buffer_descriptor.type =
params.is_secure ? destination_buffer_type_ : OEMCrypto_BufferType_Clear; params.is_secure ? destination_buffer_type_ : OEMCrypto_BufferType_Clear;
if (params.is_secure && buffer_descriptor.type == OEMCrypto_BufferType_Clear) {
return SECURE_BUFFER_REQUIRED;
}
switch (buffer_descriptor.type) { switch (buffer_descriptor.type) {
case OEMCrypto_BufferType_Clear: case OEMCrypto_BufferType_Clear:
buffer_descriptor.buffer.clear.address = buffer_descriptor.buffer.clear.address =

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

@@ -35,6 +35,8 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return kErrorCDMGeneric; return kErrorCDMGeneric;
case wvcdm::UNKNOWN_ERROR: case wvcdm::UNKNOWN_ERROR:
return android::ERROR_DRM_UNKNOWN; return android::ERROR_DRM_UNKNOWN;
case wvcdm::SECURE_BUFFER_REQUIRED:
return android::ERROR_DRM_CANNOT_HANDLE;
} }
// Return here instead of as a default case so that the compiler will warn // Return here instead of as a default case so that the compiler will warn