diff options
author | Ady Abraham <adyabr@google.com> | 2022-06-07 19:55:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-07 19:55:56 +0000 |
commit | 8762075bc1cb1442845cc4f227752a48526633c5 (patch) | |
tree | 53f4abaa3dfe2d40dde5beb272de019ea8b666c9 | |
parent | b2ea362fceb02b36c53bd34a224eebd98dca5596 (diff) | |
parent | 97a317064a76b8fc3a65bd980027f820fd4d53ae (diff) | |
download | native-8762075bc1cb1442845cc4f227752a48526633c5.tar.gz |
Merge "RESTRICT AUTOMERGE SurfaceFlinger: fix a potential race condition in stealReceiveChannel" into sc-v2-dev
-rw-r--r-- | services/surfaceflinger/Scheduler/EventThread.cpp | 5 | ||||
-rw-r--r-- | services/surfaceflinger/Scheduler/EventThread.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/services/surfaceflinger/Scheduler/EventThread.cpp b/services/surfaceflinger/Scheduler/EventThread.cpp index 2bdcaf6ad0..695c2a3787 100644 --- a/services/surfaceflinger/Scheduler/EventThread.cpp +++ b/services/surfaceflinger/Scheduler/EventThread.cpp @@ -171,6 +171,11 @@ void EventThreadConnection::onFirstRef() { } status_t EventThreadConnection::stealReceiveChannel(gui::BitTube* outChannel) { + std::scoped_lock lock(mLock); + if (mChannel.initCheck() != NO_ERROR) { + return NAME_NOT_FOUND; + } + outChannel->setReceiveFd(mChannel.moveReceiveFd()); outChannel->setSendFd(base::unique_fd(dup(mChannel.getSendFd()))); return NO_ERROR; diff --git a/services/surfaceflinger/Scheduler/EventThread.h b/services/surfaceflinger/Scheduler/EventThread.h index 9265a25b86..9526fe18be 100644 --- a/services/surfaceflinger/Scheduler/EventThread.h +++ b/services/surfaceflinger/Scheduler/EventThread.h @@ -102,7 +102,8 @@ public: private: virtual void onFirstRef(); EventThread* const mEventThread; - gui::BitTube mChannel; + std::mutex mLock; + gui::BitTube mChannel GUARDED_BY(mLock); std::vector<DisplayEventReceiver::Event> mPendingEvents; }; |