commit ab3f442e84cbb7dfd21197ee452c3b480eda481f
author Steven Moreland <smoreland@google.com> Mon Sep 27 18:38:20 2021 -0700
committer Steven Moreland <smoreland@google.com> Mon Sep 27 18:39:34 2021 -0700
tree afc03b3e0ca717cb8a038ca40b38bd5dae440c5d
parent 10717131812eaf84724f3dcc50880e38d9e03f59

libbinder: RPC avoid FdTrigger shutdown race

RpcSession's FdTrigger can't have simultaneous calls to trigger. This
will cause a double-close of the FD. Take locks to avoid this case.

Bug: 200368820
Test: binderRpcTest, binder_rpc_fuzzer, binder_bpBinderFuzz
Change-Id: I94822f441142b3a1352e38adacb8e17f285d66ac

libs/binder/RpcServer.cpp

diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp
index 5733993..4c61a59 100644
--- a/libs/binder/RpcServer.cpp
+++ b/libs/binder/RpcServer.cpp
@@ -205,8 +205,11 @@
     }
 
     mShutdownTrigger->trigger();
+
     for (auto& [id, session] : mSessions) {
         (void)id;
+        // server lock is a more general lock
+        std::lock_guard<std::mutex> _lSession(session->mMutex);
         session->mShutdownTrigger->trigger();
     }