From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2 autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 32173 invoked from network); 11 Apr 2023 13:23:47 -0000 Received: from second.openwall.net (193.110.157.125) by inbox.vuxu.org with ESMTPUTF8; 11 Apr 2023 13:23:47 -0000 Received: (qmail 19892 invoked by uid 550); 11 Apr 2023 13:23:44 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 19860 invoked from network); 11 Apr 2023 13:23:43 -0000 Date: Tue, 11 Apr 2023 09:23:31 -0400 From: Rich Felker To: musl@lists.openwall.com Message-ID: <20230411132330.GK4163@brightrain.aerifal.cx> References: <20230306085921.34269-1-izbyshev@ispras.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230306085921.34269-1-izbyshev@ispras.ru> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [musl] [PATCH] wait4: fill rusage on x32 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