diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-10 20:32:01 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-10 20:32:01 +0000 |
commit | 9621fa2188a7e34a69b8e86d820f782788232cff (patch) | |
tree | 4634957405e15322b0800d88daeee5e2d828bb9f | |
parent | d5d45be3415cbea885d44436e271032a73984d17 (diff) | |
parent | 47ce04718f42fc2f7bcceefcfc612f08ad400ec9 (diff) | |
download | platform_hardware_interfaces-oreo-m6-s4-release.tar.gz platform_hardware_interfaces-oreo-m6-s4-release.tar.bz2 platform_hardware_interfaces-oreo-m6-s4-release.zip |
Merge cherrypicks of [4741663, 4741664, 4741665, 4741666, 4743080, 4743081, 4743082, 4743083, 4741262, 4741263, 4741264, 4741265, 4741266, 4741667, 4743084, 4741242, 4741243, 4741741, 4741742, 4741743, 4741744, 4741822, 4743085, 4741668, 4741338, 4743055, 4743056, 4743070, 4743073, 4743075, 4743076, 4743078, 4743079, 4743161, 4743162, 4743164, 4743165, 4743167, 4743168, 4743169, 4743170, 4741681, 4741682, 4741683, 4741684, 4741685, 4741686, 4741687, 4741688, 4741689, 4741690, 4741691, 4741692, 4741693, 4741694, 4741695, 4741696, 4741697, 4741698, 4741699, 4743240, 4743241, 4743242, 4743243, 4741745, 4741823, 4741824, 4741825, 4741267, 4741268, 4743244, 4743280, 4743281, 4743224, 4743203, 4743204, 4743205, 4741746, 4741747, 4743245, 4741826, 4741827, 4741828, 4741829, 4741748, 4741749, 4741750, 4743233, 4743282, 4741244, 4741245, 4741246, 4741247, 4743206, 4743207, 4743208, 4743209, 4743210, 4743211, 4743212, 4743213, 4743214, 4743215, 4743216, 4743217, 4743218, 4743219, 4743360, 4743361, 4743362, 4743363, 4743364, 4743365, 4743366, 4743367, 4743368, 4743369, 4743370, 4743371, 4743372, 4743373, 4743374, 4743375, 4743376, 4743377, 4743283, 4743284, 4741830, 4742501, 4743246, 4743086, 4743087, 4743378, 4743379, 4741751] into sparse-4749909-L04200000199131547android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46oreo-m7-releaseoreo-m6-s4-release
Change-Id: Ie63b78b0b1e095e9338b29e35231cd92b4666c4a
-rw-r--r-- | cas/1.0/default/CasImpl.cpp | 81 | ||||
-rw-r--r-- | cas/1.0/default/CasImpl.h | 2 | ||||
-rw-r--r-- | cas/1.0/default/DescramblerImpl.cpp | 53 | ||||
-rw-r--r-- | cas/1.0/default/DescramblerImpl.h | 2 |
4 files changed, 80 insertions, 58 deletions
diff --git a/cas/1.0/default/CasImpl.cpp b/cas/1.0/default/CasImpl.cpp index 9d1f4a3268..178020e477 100644 --- a/cas/1.0/default/CasImpl.cpp +++ b/cas/1.0/default/CasImpl.cpp @@ -31,19 +31,8 @@ namespace cas { namespace V1_0 { namespace implementation { -struct CasImpl::PluginHolder : public RefBase { -public: - explicit PluginHolder(CasPlugin *plugin) : mPlugin(plugin) {} - ~PluginHolder() { if (mPlugin != NULL) delete mPlugin; } - CasPlugin* get() { return mPlugin; } - -private: - CasPlugin *mPlugin; - DISALLOW_EVIL_CONSTRUCTORS(PluginHolder); -}; - CasImpl::CasImpl(const sp<ICasListener> &listener) - : mPluginHolder(NULL), mListener(listener) { + : mListener(listener) { ALOGV("CTOR"); } @@ -69,7 +58,8 @@ void CasImpl::OnEvent( void CasImpl::init(const sp<SharedLibrary>& library, CasPlugin *plugin) { mLibrary = library; - mPluginHolder = new PluginHolder(plugin); + std::shared_ptr<CasPlugin> holder(plugin); + std::atomic_store(&mPluginHolder, holder); } void CasImpl::onEvent( @@ -88,21 +78,22 @@ void CasImpl::onEvent( Return<Status> CasImpl::setPrivateData(const HidlCasData& pvtData) { ALOGV("%s", __FUNCTION__); - sp<PluginHolder> holder = mPluginHolder; - if (holder == NULL) { + std::shared_ptr<CasPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); } - return toStatus(holder->get()->setPrivateData(pvtData)); + return toStatus(holder->setPrivateData(pvtData)); } Return<void> CasImpl::openSession(openSession_cb _hidl_cb) { ALOGV("%s", __FUNCTION__); CasSessionId sessionId; - sp<PluginHolder> holder = mPluginHolder; + std::shared_ptr<CasPlugin> holder = std::atomic_load(&mPluginHolder); status_t err = INVALID_OPERATION; - if (holder != NULL) { - err = holder->get()->openSession(&sessionId); + if (holder.get() != nullptr) { + err = holder->openSession(&sessionId); + holder.reset(); } _hidl_cb(toStatus(err), sessionId); @@ -114,87 +105,87 @@ Return<Status> CasImpl::setSessionPrivateData( const HidlCasSessionId &sessionId, const HidlCasData& pvtData) { ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); - sp<PluginHolder> holder = mPluginHolder; - if (holder == NULL) { + std::shared_ptr<CasPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); } - return toStatus( - holder->get()->setSessionPrivateData( - sessionId, pvtData)); + return toStatus(holder->setSessionPrivateData(sessionId, pvtData)); } Return<Status> CasImpl::closeSession(const HidlCasSessionId &sessionId) { ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); - sp<PluginHolder> holder = mPluginHolder; - if (holder == NULL) { + std::shared_ptr<CasPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); } - return toStatus(holder->get()->closeSession(sessionId)); + return toStatus(holder->closeSession(sessionId)); } Return<Status> CasImpl::processEcm( const HidlCasSessionId &sessionId, const HidlCasData& ecm) { ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); - sp<PluginHolder> holder = mPluginHolder; - if (holder == NULL) { + std::shared_ptr<CasPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); } - return toStatus(holder->get()->processEcm(sessionId, ecm)); + return toStatus(holder->processEcm(sessionId, ecm)); } Return<Status> CasImpl::processEmm(const HidlCasData& emm) { ALOGV("%s", __FUNCTION__); - sp<PluginHolder> holder = mPluginHolder; - if (holder == NULL) { + std::shared_ptr<CasPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); } - return toStatus(holder->get()->processEmm(emm)); + return toStatus(holder->processEmm(emm)); } Return<Status> CasImpl::sendEvent( int32_t event, int32_t arg, const HidlCasData& eventData) { ALOGV("%s", __FUNCTION__); - sp<PluginHolder> holder = mPluginHolder; - if (holder == NULL) { + std::shared_ptr<CasPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); } - status_t err = holder->get()->sendEvent(event, arg, eventData); + status_t err = holder->sendEvent(event, arg, eventData); return toStatus(err); } Return<Status> CasImpl::provision(const hidl_string& provisionString) { ALOGV("%s: provisionString=%s", __FUNCTION__, provisionString.c_str()); - sp<PluginHolder> holder = mPluginHolder; - if (holder == NULL) { + std::shared_ptr<CasPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); } - return toStatus(holder->get()->provision(String8(provisionString.c_str()))); + return toStatus(holder->provision(String8(provisionString.c_str()))); } Return<Status> CasImpl::refreshEntitlements( int32_t refreshType, const HidlCasData& refreshData) { ALOGV("%s", __FUNCTION__); - sp<PluginHolder> holder = mPluginHolder; - if (holder == NULL) { + std::shared_ptr<CasPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); } - status_t err = holder->get()->refreshEntitlements(refreshType, refreshData); + status_t err = holder->refreshEntitlements(refreshType, refreshData); return toStatus(err); } Return<Status> CasImpl::release() { - ALOGV("%s: plugin=%p", __FUNCTION__, - mPluginHolder != NULL ? mPluginHolder->get() : NULL); - mPluginHolder.clear(); + ALOGV("%s: plugin=%p", __FUNCTION__, mPluginHolder.get()); + + std::shared_ptr<CasPlugin> holder(nullptr); + std::atomic_store(&mPluginHolder, holder); + return Status::OK; } diff --git a/cas/1.0/default/CasImpl.h b/cas/1.0/default/CasImpl.h index 841d64e038..d7928381cc 100644 --- a/cas/1.0/default/CasImpl.h +++ b/cas/1.0/default/CasImpl.h @@ -88,7 +88,7 @@ public: private: struct PluginHolder; sp<SharedLibrary> mLibrary; - sp<PluginHolder> mPluginHolder; + std::shared_ptr<CasPlugin> mPluginHolder; sp<ICasListener> mListener; DISALLOW_EVIL_CONSTRUCTORS(CasImpl); diff --git a/cas/1.0/default/DescramblerImpl.cpp b/cas/1.0/default/DescramblerImpl.cpp index 36699baf28..6d5e2d5e32 100644 --- a/cas/1.0/default/DescramblerImpl.cpp +++ b/cas/1.0/default/DescramblerImpl.cpp @@ -50,12 +50,12 @@ CHECK_SUBSAMPLE_DEF(CryptoPlugin); DescramblerImpl::DescramblerImpl( const sp<SharedLibrary>& library, DescramblerPlugin *plugin) : - mLibrary(library), mPlugin(plugin) { - ALOGV("CTOR: mPlugin=%p", mPlugin); + mLibrary(library), mPluginHolder(plugin) { + ALOGV("CTOR: plugin=%p", mPluginHolder.get()); } DescramblerImpl::~DescramblerImpl() { - ALOGV("DTOR: mPlugin=%p", mPlugin); + ALOGV("DTOR: plugin=%p", mPluginHolder.get()); release(); } @@ -63,12 +63,22 @@ Return<Status> DescramblerImpl::setMediaCasSession(const HidlCasSessionId& sessi ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); - return toStatus(mPlugin->setMediaCasSession(sessionId)); + std::shared_ptr<DescramblerPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { + return toStatus(INVALID_OPERATION); + } + + return toStatus(holder->setMediaCasSession(sessionId)); } Return<bool> DescramblerImpl::requiresSecureDecoderComponent( const hidl_string& mime) { - return mPlugin->requiresSecureDecoderComponent(String8(mime.c_str())); + std::shared_ptr<DescramblerPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { + return false; + } + + return holder->requiresSecureDecoderComponent(String8(mime.c_str())); } static inline bool validateRangeForSize( @@ -86,6 +96,16 @@ Return<void> DescramblerImpl::descramble( descramble_cb _hidl_cb) { ALOGV("%s", __FUNCTION__); + // hidl_memory's size is stored in uint64_t, but mapMemory's mmap will map + // size in size_t. If size is over SIZE_MAX, mapMemory mapMemory could succeed + // but the mapped memory's actual size will be smaller than the reported size. + if (srcBuffer.heapBase.size() > SIZE_MAX) { + ALOGE("Invalid hidl_memory size: %llu", srcBuffer.heapBase.size()); + android_errorWriteLog(0x534e4554, "79376389"); + _hidl_cb(toStatus(BAD_VALUE), 0, NULL); + return Void(); + } + sp<IMemory> srcMem = mapMemory(srcBuffer.heapBase); // Validate if the offset and size in the SharedBuffer is consistent with the @@ -143,10 +163,21 @@ Return<void> DescramblerImpl::descramble( dstBuffer.secureMemory.getNativeHandle()); dstPtr = static_cast<void *>(handle); } + + // Get a local copy of the shared_ptr for the plugin. Note that before + // calling the HIDL callback, this shared_ptr must be manually reset, + // since the client side could proceed as soon as the callback is called + // without waiting for this method to go out of scope. + std::shared_ptr<DescramblerPlugin> holder = std::atomic_load(&mPluginHolder); + if (holder.get() == nullptr) { + _hidl_cb(toStatus(INVALID_OPERATION), 0, NULL); + return Void(); + } + // Casting hidl SubSample to DescramblerPlugin::SubSample, but need // to ensure structs are actually idential - int32_t result = mPlugin->descramble( + int32_t result = holder->descramble( dstBuffer.type != BufferType::SHARED_MEMORY, (DescramblerPlugin::ScramblingControl)scramblingControl, subSamples.size(), @@ -157,17 +188,17 @@ Return<void> DescramblerImpl::descramble( dstOffset, NULL); + holder.reset(); _hidl_cb(toStatus(result >= 0 ? OK : result), result, NULL); return Void(); } Return<Status> DescramblerImpl::release() { - ALOGV("%s: mPlugin=%p", __FUNCTION__, mPlugin); + ALOGV("%s: plugin=%p", __FUNCTION__, mPluginHolder.get()); + + std::shared_ptr<DescramblerPlugin> holder(nullptr); + std::atomic_store(&mPluginHolder, holder); - if (mPlugin != NULL) { - delete mPlugin; - mPlugin = NULL; - } return Status::OK; } diff --git a/cas/1.0/default/DescramblerImpl.h b/cas/1.0/default/DescramblerImpl.h index d3b146ecc7..305f115473 100644 --- a/cas/1.0/default/DescramblerImpl.h +++ b/cas/1.0/default/DescramblerImpl.h @@ -55,7 +55,7 @@ public: private: sp<SharedLibrary> mLibrary; - DescramblerPlugin *mPlugin; + std::shared_ptr<DescramblerPlugin> mPluginHolder; DISALLOW_EVIL_CONSTRUCTORS(DescramblerImpl); }; |