The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3507
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From eb551cefedb4d6c21aae30ac7ba1b03f8e127fc9 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Thu, 6 Aug 2020 14:14:10 +0200
Subject: [PATCH] seccomp: don't close the mainloop, simply remove the handler
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
src/lxc/seccomp.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index 011e574875..ad1f51922b 100644
--- 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)
- return log_trace(LXC_MAINLOOP_CLOSE, "Syscall supervisee
already exited");
+ if (events & EPOLLHUP) {
+ 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);
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
