Automated rollback of commit fa30cb7.

PiperOrigin-RevId: 794614830
Change-Id: Ie62133ce8b3a3b0a3dcca4005f2b4ecfa25bca14

Author: happyCoder92

sandboxed_api/sandbox2/fork_client.cc

@@ -40,7 +40,7 @@ SandboxeeProcess ForkClient::SendRequest(const ForkRequest& request,
                                          int exec_fd, int comms_fd) {
   SandboxeeProcess process;
   // Acquire the channel ownership for this request (transaction).
-  absl::MutexLock l(comms_mutex_);
+  absl::MutexLock l(&comms_mutex_);
 
   if (!comms_->SendProtoBuf(request)) {
     LOG(ERROR) << "Sending PB to the ForkServer failed";

sandboxed_api/sandbox2/global_forkclient.cc

@@ -168,7 +168,7 @@ absl::Mutex GlobalForkClient::instance_mutex_(absl::kConstInit);
 GlobalForkClient* GlobalForkClient::instance_ = nullptr;
 
 void GlobalForkClient::EnsureStarted(GlobalForkserverStartMode mode) {
-  absl::MutexLock lock(instance_mutex_);
+  absl::MutexLock lock(&instance_mutex_);
   EnsureStartedLocked(mode);
 }
 
@@ -199,7 +199,7 @@ void GlobalForkClient::EnsureStartedLocked(GlobalForkserverStartMode mode) {
 }
 
 void GlobalForkClient::ForceStart() {
-  absl::MutexLock lock(GlobalForkClient::instance_mutex_);
+  absl::MutexLock lock(&GlobalForkClient::instance_mutex_);
   SAPI_RAW_CHECK(instance_ == nullptr,
                  "A force start requested when the Global Fork-Server was "
                  "already running");
@@ -212,7 +212,7 @@ void GlobalForkClient::ForceStart() {
 void GlobalForkClient::Shutdown() {
   pid_t pid = -1;
   {
-    absl::MutexLock lock(GlobalForkClient::instance_mutex_);
+    absl::MutexLock lock(&GlobalForkClient::instance_mutex_);
     if (instance_) {
       pid = instance_->fork_client_.pid();
     }
@@ -226,7 +226,7 @@ void GlobalForkClient::Shutdown() {
 
 SandboxeeProcess GlobalForkClient::SendRequest(const ForkRequest& request,
                                                int exec_fd, int comms_fd) {
-  absl::ReleasableMutexLock lock(GlobalForkClient::instance_mutex_);
+  absl::ReleasableMutexLock lock(&GlobalForkClient::instance_mutex_);
   EnsureStartedLocked(GlobalForkserverStartMode::kOnDemand);
   if (!instance_) {
     return SandboxeeProcess();
@@ -247,7 +247,7 @@ SandboxeeProcess GlobalForkClient::SendRequest(const ForkRequest& request,
 }
 
 pid_t GlobalForkClient::GetPid() {
-  absl::MutexLock lock(instance_mutex_);
+  absl::MutexLock lock(&instance_mutex_);
   EnsureStartedLocked(GlobalForkserverStartMode::kOnDemand);
   if (!instance_) {
     return -1;
@@ -256,7 +256,7 @@ pid_t GlobalForkClient::GetPid() {
 }
 
 bool GlobalForkClient::IsStarted() {
-  absl::ReaderMutexLock lock(instance_mutex_);
+  absl::ReaderMutexLock lock(&instance_mutex_);
   return instance_ != nullptr;
 }
 }  // namespace sandbox2

sandboxed_api/sandbox2/logsink.cc

@@ -36,7 +36,7 @@ LogSink::LogSink(int fd) : comms_(fd) { absl::AddLogSink(this); }
 LogSink::~LogSink() { absl::RemoveLogSink(this); }
 
 void LogSink::Send(const absl::LogEntry& e) {
-  absl::MutexLock l(lock_);
+  absl::MutexLock l(&lock_);
 
   LogMessage msg;
   msg.set_severity(static_cast<int>(e.log_severity()));

sandboxed_api/sandbox2/monitor_ptrace.cc

@@ -182,15 +182,15 @@ void PtraceMonitor::NotifyMonitor() {
   if (use_deadline_manager_) {
     pid_waiter_.Notify();
   } else {
-    absl::MutexLock lock(thread_mutex_);
+    absl::MutexLock lock(&thread_mutex_);
     if (thread_.IsJoinable()) {
       pthread_kill(thread_.handle(), SIGCHLD);
     }
   }
 }
 
 void PtraceMonitor::Join() {
-  absl::MutexLock lock(thread_mutex_);
+  absl::MutexLock lock(&thread_mutex_);
   if (thread_.IsJoinable()) {
     thread_.Join();
     CHECK(IsDone()) << "Monitor did not terminate";
@@ -201,7 +201,7 @@ void PtraceMonitor::Join() {
 
 void PtraceMonitor::RunInternal() {
   {
-    absl::MutexLock lock(thread_mutex_);
+    absl::MutexLock lock(&thread_mutex_);
     thread_ = sapi::Thread(this, &PtraceMonitor::Run, "sandbox2-Monitor");
   }
 

sandboxed_api/sandbox2/monitor_unotify.cc

@@ -388,7 +388,7 @@ bool UnotifyMonitor::InitSetupNotifyEventFd() {
 }
 
 void UnotifyMonitor::NotifyMonitor() {
-  absl::ReaderMutexLock lock(notify_mutex_);
+  absl::ReaderMutexLock lock(&notify_mutex_);
   if (monitor_notify_fd_.get() < 0) {
     return;
   }
@@ -414,7 +414,7 @@ void UnotifyMonitor::KillInit() {
 }
 
 void UnotifyMonitor::Join() {
-  absl::MutexLock lock(notify_mutex_);
+  absl::MutexLock lock(&notify_mutex_);
   if (thread_.IsJoinable()) {
     thread_.Join();
     CHECK(IsDone()) << "Monitor did not terminate";