Merge pull request #3507 from brauner/2020-08-06/fixes

seccomp: don't close the mainloop, simply remove the handler

Merge pull request #3507 from brauner/2020-08-06/fixes
05af17d7 · Stéphane Graber · GitHub · c6018400 · eb551cef · 05af17d7
Unverified Commit 05af17d7 authored Aug 06, 2020 by Stéphane Graber Committed by GitHub Aug 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

seccomp.c src/lxc/seccomp.c +5 -2

No files found.
--- a/src/lxc/seccomp.c
+++ b/src/lxc/seccomp.c
@@ -1374,8 +1374,11 @@ int seccomp_notify_handler(int fd, uint32_t events, void *data,
 	char *cookie = conf->seccomp.notifier.cookie;
 	uint64_t req_id;
-	if (events & EPOLLHUP)
+	if (events & EPOLLHUP) {
-		return log_trace(LXC_MAINLOOP_CLOSE, "Syscall supervisee already exited");
+		lxc_mainloop_del_handler(descr, fd);
+		close(fd);
+		return log_trace(0, "Removing seccomp notifier fd %d", fd);
+	}
 	memset(req, 0, sizeof(*req));
 	ret = seccomp_notify_receive(fd, req);