From nobody Wed Jun 10 02:37:44 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gZqgs1jFNz6glQj for ; Wed, 10 Jun 2026 02:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZqgs0z5fz3p8R for ; Wed, 10 Jun 2026 02:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781059065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Za2IGqsXs+WEbf+XTE8Jkh8bIT/YjcJE08YC5YwgPUQ=; b=IYXR+FpNNuEm94ayCJkq871ajXwNIW+8ZaJDiGrRLJSeSLHFwF6EubXUFUK4Qvg/Y7K1Ld I3yfORUERAllGuZMSjLfth77bE4lDjxY7w4sdZzBtb8wMZ7W4hKIiPulgdFWQuXgMD4Jhy WfnjojNlW9Gmd6bYy1vfK5D7ZpL7Lrr/osofE1WuDFpAG54vtwr4fMudXy0hIOWbuuvqDZ UVkXkY5Z2DDXS8ASQbbJdNV+Q4inOnF1BjUpTFheuq37D0fXe/rSkMX+xBS8EvHfmWHX23 egp46KDvT7q4vawTgToppC0gKL/hVyRedcFBEwsZ6mYLIt8Bx+gwsokcS+e5Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781059065; a=rsa-sha256; cv=none; b=rYMvng0N1bWMsNNta6qa5EIoWbNlilv0YoVHZTlNROUoMNYMJ4w78HDA9nnlm0lpkNE60g 4/m1BV1BlO4HjdFMIilEOCdNYWTHSfjetDC+/Q9k3Hszz1gvMmYfa6x2Lx4eoKsZbWTn7/ 2ETMtkYWbZO85frLzP6GsvW+IpsAA4Cwl+V0sVgska4dRyWHm2ZhexMyLhQPvL8DA2w2FD nv5qwG9/mkaZ6s6Fj0hcqjkEk3lWbBo2A4gd5Sac1rd8wsOmnh6iDinSN2jiWjktTgnCDm vl1GRBIe4tLDffHKeRwJBrX0TTyFFaGRXUXfSU8g4HNgXNYq+YhJaAmzwNMS3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781059065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Za2IGqsXs+WEbf+XTE8Jkh8bIT/YjcJE08YC5YwgPUQ=; b=v1Vr+4L0N/h5FOkQ+AFQ/p8sCl6D0azs41eLHnIXtDtXqdIdB2QOIxMdprme+UmEX6jy3U Zuw/G0wKoVe2KZE7DaOwRglnpWO/NDX+zOg1o0Z8SbiM2QwbfQpTFA7hdqUfgdRQTAdxGl 164xPNOiGClNnIHsTB2F0pLYNJUoyyNl/tH/0wbURHiY741c2/Zf3XkEDHGJcIVOoMGRX0 DkwEU6fsiMDXz+vLqalxxehNSTC2dyYh/3DIlh3XdaXhwYUayGncnQxNaRrYnkLgqBqrdG ilMn0clCaafpFd8ReMW5h9O2l8py4VdnBu8RMRgoDjCs8luRGDcK1WzQjsFIcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZqgs0K3hz11fg for ; Wed, 10 Jun 2026 02:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e406 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Jun 2026 02:37:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 89fa97f0a71d - main - compat32 wait4/6(2): only copy out when there is a pid to report List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89fa97f0a71d4988891766c4e69eeb9687016b14 Auto-Submitted: auto-generated Date: Wed, 10 Jun 2026 02:37:44 +0000 Message-Id: <6a28cdf8.1e406.43d933b4@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=89fa97f0a71d4988891766c4e69eeb9687016b14 commit 89fa97f0a71d4988891766c4e69eeb9687016b14 Author: Konstantin Belousov AuthorDate: 2026-06-09 21:33:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-10 02:37:25 +0000 compat32 wait4/6(2): only copy out when there is a pid to report PR: 295965 Reported and tested by: mandree Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57513 --- sys/compat/freebsd32/freebsd32_misc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index a0b6118900ed..e4a4f256feb4 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -234,11 +234,9 @@ freebsd32_wait4(struct thread *td, struct freebsd32_wait4_args *uap) else rup = NULL; error = kern_wait(td, uap->pid, &status, uap->options, rup); - if (error) - return (error); - if (uap->status != NULL) + if (uap->status != NULL && error == 0 && td->td_retval[0] != 0) error = copyout(&status, uap->status, sizeof(status)); - if (uap->rusage != NULL && error == 0) { + if (uap->rusage != NULL && error == 0 && td->td_retval[0] != 0) { freebsd32_rusage_out(&ru, &ru32); error = copyout(&ru32, uap->rusage, sizeof(ru32)); } @@ -265,11 +263,9 @@ freebsd32_wait6(struct thread *td, struct freebsd32_wait6_args *uap) sip = NULL; error = kern_wait6(td, uap->idtype, PAIR32TO64(id_t, uap->id), &status, uap->options, wrup, sip); - if (error != 0) - return (error); - if (uap->status != NULL) + if (uap->status != NULL && error == 0 && td->td_retval[0] != 0) error = copyout(&status, uap->status, sizeof(status)); - if (uap->wrusage != NULL && error == 0) { + if (uap->wrusage != NULL && error == 0 && td->td_retval[0] != 0) { freebsd32_rusage_out(&wru.wru_self, &wru32.wru_self); freebsd32_rusage_out(&wru.wru_children, &wru32.wru_children); error = copyout(&wru32, uap->wrusage, sizeof(wru32));