From 38280c3526845852c4da09fd0c11090493ee58fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Fri, 26 Mar 2021 22:21:00 +0100 Subject: [PATCH] zed: reap child after killing on time-out MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a child process is killed waitpid() must be called on the pid the reap the zombie process. Update BUGS section to reflect reality by replacing "zedlets aren't time limited with "zedlets can be interrupted". Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #11769 Closes #11798 --- cmd/zed/zed_exec.c | 1 + man/man8/zed.8.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/zed/zed_exec.c b/cmd/zed/zed_exec.c index aae607a9b7..e8f5102138 100644 --- a/cmd/zed/zed_exec.c +++ b/cmd/zed/zed_exec.c @@ -173,6 +173,7 @@ _zed_exec_fork_child(uint64_t eid, const char *dir, const char *prog, zed_log_msg(LOG_WARNING, "Killing hung \"%s\" pid=%d", prog, pid); (void) kill(pid, SIGKILL); + (void) waitpid(pid, &status, 0); } } diff --git a/man/man8/zed.8.in b/man/man8/zed.8.in index 3d36c33ac9..e32a89de8a 100644 --- a/man/man8/zed.8.in +++ b/man/man8/zed.8.in @@ -234,8 +234,8 @@ Terminate the daemon. Events are processed synchronously by a single thread. This can delay the processing of simultaneous zevents. .PP -There is no maximum timeout for ZEDLET execution. Consequently, a misbehaving -ZEDLET can delay the processing of subsequent zevents. +ZEDLETs are killed after a maximum of ten seconds. +This can lead to a violation of a ZEDLET's atomicity assumptions. .PP The ownership and permissions of the \fIenabled-zedlets\fR directory (along with all parent directories) are not checked. If any of these directories