From: Rich Felker <dalias@libc.org>
To: musl@lists.openwall.com
Subject: Re: [musl] [PATCH] wait4: fill rusage on x32
Date: Tue, 11 Apr 2023 09:23:31 -0400 [thread overview]
Message-ID: <20230411132330.GK4163@brightrain.aerifal.cx> (raw)
In-Reply-To: <20230306085921.34269-1-izbyshev@ispras.ru>
On Mon, Mar 06, 2023 at 11:59:21AM +0300, Alexey Izbyshev wrote:
> Resource usage data is filled by the kernel only when wait4 returns
> a pid, i.e. a positive value.
>
> Commit 5850546e9669f793aab61dfc7c4f2c1ff35c4b29 introduced this bug,
> possibly because of copy-pasting from getrusage.
> ---
> src/linux/wait4.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/linux/wait4.c b/src/linux/wait4.c
> index 83650e34..ff2e3e66 100644
> --- a/src/linux/wait4.c
> +++ b/src/linux/wait4.c
> @@ -12,7 +12,7 @@ pid_t wait4(pid_t pid, int *status, int options, struct rusage *ru)
> if (ru) {
> long long kru64[18];
> r = __syscall(SYS_wait4_time64, pid, status, options, kru64);
> - if (!r) {
> + if (r > 0) {
> ru->ru_utime = (struct timeval)
> { .tv_sec = kru64[0], .tv_usec = kru64[1] };
> ru->ru_stime = (struct timeval)
> --
> 2.39.1
Sorry this got overlooked. Applying now.
Rich
prev parent reply other threads:[~2023-04-11 13:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-06 8:59 Alexey Izbyshev
2023-04-11 13:23 ` Rich Felker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230411132330.GK4163@brightrain.aerifal.cx \
--to=dalias@libc.org \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).