Fix wrong StatusOr access in HandleUnotify

happyCoder92 · copybara-github · commit 5c6eab56b6d4 · 2026-04-09T08:59:02.000-07:00
If ENOENT on read from the unotify fd is raised the function did not return early as intended.

PiperOrigin-RevId: 897140378
Change-Id: If00383a2b2aae8c1e82f7127a98ce9ed850f41a9
diff --git a/sandboxed_api/sandbox2/monitor_unotify.cc b/sandboxed_api/sandbox2/monitor_unotify.cc
@@ -202,8 +202,8 @@ void UnotifyMonitor::HandleUnotify() {
       VLOG(1) << "Unotify recv failed with ENOENT";
     } else {
       SetExitStatusCode(Result::INTERNAL_ERROR, Result::FAILED_NOTIFY);
-      return;
     }
+    return;
   }
   Syscall syscall(req_data->pid, req_data->data);
   if (wait_for_execveat() && syscall.nr() == __NR_execveat &&

Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,8 @@ void UnotifyMonitor::HandleUnotify() {`
`202`	`202`	`VLOG(1) << "Unotify recv failed with ENOENT";`
`203`	`203`	`} else {`
`204`	`204`	`SetExitStatusCode(Result::INTERNAL_ERROR, Result::FAILED_NOTIFY);`
`205`		`- return;`
`206`	`205`	`}`
	`206`	`+ return;`
`207`	`207`	`}`
`208`	`208`	`Syscall syscall(req_data->pid, req_data->data);`
`209`	`209`	`if (wait_for_execveat() && syscall.nr() == __NR_execveat &&`