Skip to content

Commit 80f09a7

Browse files
committed
Fix race in libzfs_run_process_impl
When replacing a disk, a child process is forked to run a script called zfs_prepare_disk (which can be useful for disk firmware update or health check). The parent than calls waitpid and checks the child error/status code. However, the _reap_children thread (created from zed_exec_process to manage zedlets) also waits for all children with the same PGID and can stole the signal, causing the replace operation to be aborted. As waitpid returns -1, the parent incorrectly assume that the child process had an error or was killed. This, in turn, leaves the newly added disk in REMOVED or UNAVAIL status rather than completing the replace process. This patch changes the PGID of the child process execuing the prepare script, shielding it from the _reap_children thread. Signed-off-by: Gionatan Danti <[email protected]>
1 parent 38c0324 commit 80f09a7

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

lib/libzfs/libzfs_util.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,7 @@ libzfs_run_process_impl(const char *path, char *argv[], char *env[], int flags,
932932
pid = fork();
933933
if (pid == 0) {
934934
/* Child process */
935+
setpgid (0, 0);
935936
devnull_fd = open("/dev/null", O_WRONLY | O_CLOEXEC);
936937

937938
if (devnull_fd < 0)

0 commit comments

Comments
 (0)