From nobody Sat Jun 13 01:04:00 2026 X-Original-To: dev-commits-src-all@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 4gcdSK3mKXz6hStN for ; Sat, 13 Jun 2026 01:04:01 +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 4gcdSJ5Gzbz3lt9 for ; Sat, 13 Jun 2026 01:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781312640; 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=azrPPImoO2Ub6xH5f+/xVUKC/sMcYnScMjKxvlz1XJo=; b=ZqXV1wOxqM44oKHJ8Tmm5vSDNp3OpkHS+PisQjP0TXm1A1n3iyCzIfSUgxjYC6bZp2RV4e BzqRJhuzz5dO8ZiuAJ45v8cwpLw4ZHzIHibRZKDXbABQpJmkhC5DCxb5wW5HDhD1KuMPmf SQsfmeP/mbB1Ri3NqQrq8FCNPip8fRLEzAjllicRp0YGkMDqNA8IpSM8FGA5EN4BzZTMGN UjrrflvqbC/ifQmzv4SfrMSJGLolnEOJHn4vSQ3TpZvjvfi2HtDYkIxQG+jHITuP/KmqsA OqWJsLOI3Spu7q8Spqs8Qy4drDGn2krkSf40hfrCZfjn7B/yoDVOOwOs4Xb2cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781312640; a=rsa-sha256; cv=none; b=gvY4oZiVs7t4kejzqaKRThf8nUMY/n2WA+NSlt0THfmhZVhFZYfPgsV4ErvyMmFHP5VPvS IjGJKTMQ5eOtenubi1AD69QFYv+YcMUXCtxWp1sqmgyMl4gG37HPsh3xwlAOn1lsYVSa4E eBjyHn06TfpmzzRwCGl3GTN7UNeXok1ifs/Xaf1dlv/hNvFX50o8AZ4q1VwvbV+0HRQ8+u WOB6Tec3xHSbbHuHuhpmgTWx+/0y84v8WXjlXmZ6zSAgXzjjJet1DFDncrmZsINtXO6cT3 8iPEH6mIvJjVL181e5TmHRJf/KQlK2S3NUlZC5L8FYcXL7mSIius9ZhA5dlNqQ== 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=1781312640; 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=azrPPImoO2Ub6xH5f+/xVUKC/sMcYnScMjKxvlz1XJo=; b=IRtasyoYhWwU7nOO1eTPvXQgCoben0HxdBauiNG6LWq1IPye4tLsu5tF5z3uZBB/uQk4Jo AZyPNsnqrTYKTGC/+LKfT251SB15wFgyMA+680AtIWxwLLNE6IpsQ/jr6i9UADlZNjgc68 He61BdYspgYd/zzlQGh5gXTc93QmiayU/M+fYRPlWuXu//l/nM7Gn0OwwGjzBNnWeVXRde pUxAOuMsWty5Yp0vR6z14F7bwY2tFa2FZPgaFDo/2xh+hXffqXfCtXJzUw86J8zMaux2SZ KLP/JxaHPRlOuEbD4KpUsG0+FTpByjXhNOsVYTiVci295cDJHh2kbMLCNSiNbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcdSJ4mlPz11QW for ; Sat, 13 Jun 2026 01:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20f63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 01:04:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 669642faa394 - stable/15 - compat32 wait4/6(2): only copy out when there is a pid to report List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: 669642faa3942906438cd55b44921578fd3db2b4 Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 01:04:00 +0000 Message-Id: <6a2cac80.20f63.4d94c4a7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=669642faa3942906438cd55b44921578fd3db2b4 commit 669642faa3942906438cd55b44921578fd3db2b4 Author: Konstantin Belousov AuthorDate: 2026-06-09 21:33:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-13 00:58:39 +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 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));