diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-11-10 08:35:00 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-11-10 08:35:00 +0000 |
commit | 986f449fdc0bff8125327757fba1a7762d93c764 (patch) | |
tree | f137f4f9243ed67cfbe01a0cb73afb37cb075109 | |
parent | e539aa7d023168521a8e0d42801b06ba07cffdbc (diff) | |
parent | 5c75978f530b27bd976d8695ed79acd336c24776 (diff) | |
download | pixel-986f449fdc0bff8125327757fba1a7762d93c764.tar.gz |
Merge "ADPF: fix use-after-free crash" into tm-qpr-dev
-rw-r--r-- | power-libperfmgr/aidl/PowerHintSession.cpp | 11 | ||||
-rw-r--r-- | power-libperfmgr/aidl/PowerHintSession.h | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/power-libperfmgr/aidl/PowerHintSession.cpp b/power-libperfmgr/aidl/PowerHintSession.cpp index 5f244968..14cbf014 100644 --- a/power-libperfmgr/aidl/PowerHintSession.cpp +++ b/power-libperfmgr/aidl/PowerHintSession.cpp @@ -265,14 +265,10 @@ ndk::ScopedAStatus PowerHintSession::close() { } // Remove the session from PowerSessionManager first to avoid racing. PowerSessionManager::getInstance()->removePowerSession(this); - setSessionUclampMin(0); - { - std::lock_guard<std::mutex> guard(mSessionLock); - mSessionClosed.store(true); - } - mDescriptor->is_active.store(false); mEarlyBoostHandler->setSessionDead(); mStaleTimerHandler->setSessionDead(); + setSessionUclampMin(0); + mDescriptor->is_active.store(false); updateUniveralBoostMode(); return ndk::ScopedAStatus::ok(); } @@ -505,6 +501,7 @@ void PowerHintSession::StaleTimerHandler::updateTimer(time_point<steady_clock> s } void PowerHintSession::StaleTimerHandler::handleMessage(const Message &) { + std::lock_guard<std::mutex> guard(mClosedLock); if (mIsSessionDead) { return; } @@ -534,7 +531,7 @@ void PowerHintSession::StaleTimerHandler::handleMessage(const Message &) { } void PowerHintSession::StaleTimerHandler::setSessionDead() { - std::lock_guard<std::mutex> guard(mStaleLock); + std::lock_guard<std::mutex> guard(mClosedLock); mIsSessionDead = true; PowerHintMonitor::getInstance()->getLooper()->removeMessages(mSession->mStaleTimerHandler); } diff --git a/power-libperfmgr/aidl/PowerHintSession.h b/power-libperfmgr/aidl/PowerHintSession.h index 96b445ed..9bd9a2ca 100644 --- a/power-libperfmgr/aidl/PowerHintSession.h +++ b/power-libperfmgr/aidl/PowerHintSession.h @@ -105,7 +105,7 @@ class PowerHintSession : public BnPowerHintSession { private: PowerHintSession *mSession; - std::mutex mStaleLock; + std::mutex mClosedLock; std::mutex mMessageLock; std::atomic<time_point<steady_clock>> mStaleTime; std::atomic<bool> mIsMonitoring; |