From nobody Sat Jun 13 01:20:06 2026 X-Original-To: dev-commits-src-branches@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 4gcdpv02RMz6hV0M for ; Sat, 13 Jun 2026 01:20:07 +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 4gcdpt6YFHz3tS1 for ; Sat, 13 Jun 2026 01:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781313606; 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=ONsYyyVQboZXlUJBl0qXXLJmC9dDzB24I80ebQl0jbo=; b=ap9LNSmpszD8RPf259qtI6uKTlZ03AKPvtDWd/J/NeM8I7Tu5dPJY6M/FxRBZcRzHraEny smcdBQEPcB7/zSM45xCH85h+FJdlJlhL6FpgCnznRtZiKKsCxUhp8jbvsUGhMDuwtTkd6H sbPus5hnqN7C8Qd27cR1wV8KiTLVzUYrAB8BWYVsK0N+lQ97EzNWdvV4r3vpf6LV345puK LOUrbI5P1ehS0SfdYVZmBKieu59w9+u8T2o2jrJtNh0gbSulAMqmH01GkK78u69toXJFfl dj4n3e2q48Qay1W0OUH+uMdXDK9lQ9EysF5SHgko2NaZD/jJ6K/11Skhv5P47g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781313606; a=rsa-sha256; cv=none; b=wMOZwO7aLI66ynQ8CkESnifDssAT3PvyR++pBGNR3PVz7WwFvqefuRsGWKyGbJiLsRj7xV Vc30dAREW/5IwEp7z8fGolpYuXqLh9m5zwIR6lX9dZ2cE4yCfl7jGaletZ91dXlCChlRDJ /NyzlCjpyED32aTdzV/2yQvqJ4nMFLZrZBL5M0Eo5SLqtxsx0uhbRYbjs2iIYABL/ct9xY ZAlarUEpHdMUXpcGmxS7C7RA/b7cFQpCiDgCZaLdeBcPllcK7tOHy/dXm631ZBgSIFu4aG 3WD4XEEA6MaPtmLl2wM2HG7cwvuKOKyVIxq1a7zqwnZu6d7/tap41Yo0ShU8uA== 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=1781313606; 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=ONsYyyVQboZXlUJBl0qXXLJmC9dDzB24I80ebQl0jbo=; b=pebIpC7hlh5LGi7Y0vj0a7+u/rGJVEN5x3wtihAGpA6SzQGE/e5izxhtzr/z/PEoH+xWH/ nv36ljgWYfVC4OQJ4RX9of5TCWKT64QQRiNZVxnmOPzI7cGb0hlH9jEDiAtIAKWqdNmDCB L5heJ2zJ0VXbp8sfJaaNBnQmRyGoLj/lbJoi6aZNwxeV8kJVrZGIFdCzpGAD3aID1pEmvP HWFfESM4VpRlnEvjgJxnnWuUEXj0EDlCVHcw/gh5T1XIEs8ALOMSueAoxdCi6MtfpREWo7 3DBEII3oDbs08xAJtzT6SsWOTa3QsL5NeYodeGT/Rg24bGb1eg9DV+pqBQ3eMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcdpt67H2z11tx for ; Sat, 13 Jun 2026 01:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 229a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 01:20:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d2387bb8e2ac - stable/14 - compat32 wait4/6(2): only copy out when there is a pid to report List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d2387bb8e2acabcfd2b2975f3d389c89aedb8f2d Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 01:20:06 +0000 Message-Id: <6a2cb046.229a3.2c931108@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d2387bb8e2acabcfd2b2975f3d389c89aedb8f2d commit d2387bb8e2acabcfd2b2975f3d389c89aedb8f2d Author: Konstantin Belousov AuthorDate: 2026-06-09 21:33:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-13 01:04:41 +0000 compat32 wait4/6(2): only copy out when there is a pid to report PR: 295965 (cherry picked from commit 89fa97f0a71d4988891766c4e69eeb9687016b14) --- 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 0d35d1291316..326c7c293356 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -233,11 +233,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)); } @@ -264,11 +262,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));