diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2025-07-11 15:12:17 +0100 |
---|---|---|
committer | Richard Henderson <richard.henderson@linaro.org> | 2025-07-11 10:45:14 -0600 |
commit | d6390204c61e148488f034d1f79be35cd3318d93 (patch) | |
tree | 602945ed1080fc551aeac9438a6e69218f95db60 | |
parent | c86da2b1dd7589d414b5a2d1e5361d6c3b4ca885 (diff) | |
download | qemu-d6390204c61e148488f034d1f79be35cd3318d93.zip qemu-d6390204c61e148488f034d1f79be35cd3318d93.tar.gz qemu-d6390204c61e148488f034d1f79be35cd3318d93.tar.bz2 |
linux-user: Use qemu_set_cloexec() to mark pidfd as FD_CLOEXEC
In the linux-user do_fork() function we try to set the FD_CLOEXEC
flag on a pidfd like this:
fcntl(pid_fd, F_SETFD, fcntl(pid_fd, F_GETFL) | FD_CLOEXEC);
This has two problems:
(1) it doesn't check errors, which Coverity complains about
(2) we use F_GETFL when we mean F_GETFD
Deal with both of these problems by using qemu_set_cloexec() instead.
That function will assert() if the fcntls fail, which is fine (we are
inside fork_start()/fork_end() so we know nothing can mess around
with our file descriptors here, and we just got this one from
pidfd_open()).
(As we are touching the if() statement here, we correct the
indentation.)
Coverity: CID 1508111
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20250711141217.1429412-1-peter.maydell@linaro.org>
-rw-r--r-- | linux-user/syscall.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 38dd563..91360a0 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6747,10 +6747,9 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, int pid_child = ret; pid_fd = pidfd_open(pid_child, 0); if (pid_fd >= 0) { - fcntl(pid_fd, F_SETFD, fcntl(pid_fd, F_GETFL) - | FD_CLOEXEC); + qemu_set_cloexec(pid_fd); } else { - pid_fd = 0; + pid_fd = 0; } #endif put_user_u32(pid_fd, parent_tidptr); |