From nobody Mon Nov 09 11:08:08 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 4jNRpc65cdz6yGlp for ; Mon, 09 Nov 2026 11:08:08 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNRpc55pRz3DpJ for ; Mon, 09 Nov 2026 11:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794222488; 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=Lti9JHeT6p13qJmt2DC6ocwnNtHCvarc4SXjY/8oGq8=; b=s0bRmjiAwKU7xeCDSeOQgyR48xsNuXMk7Xu6nBm/Woh2PzKcxuaTBzijQtVn4sl1hC9aCD Z+DJVHyX61WgnhJEIrE/Wqjkbldr4k/5+BIzZJA3w4frJAIOM9enIa/hTl3pXaAREIyGmm 3e3aDs6BpH9I2rA4xoCed5gR8Dvlgkk2PfXHrPYt2lEkfVzQkNAtg6Jj5PyyB1ACHqZUAv I03apDFgYoxdlSBsB3/lIUPbOQJzGnn6rk/RTzFOAZnbU/L0tg0wqpXjVa6DsWo2etSjrP JWroBK/y8fRQaYxO+BCJUObOJDzD1L+IPUgT7A7eui/elYkEjClcrDAn+CslJw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794222488; b=lK70dEHckfj+lp3/XZcunlygZQzJBO79WRBkMW7Ml5uLNC+xFuCRoJ/1MOIo/dW14z2SF8 w7ytoUqrsrrQLVB7z3Xwf1TvG8iL5yHynV8OxGuh4FOW0xo55/o7QKLqsJqoFqoIBNv6wY DraqBENH6XW+EfZDJ4g1JZegzbeoUh3p2I+wS7p5HaVXwTNRUpbq29ig06VUYc5VpXO1kI PqMSvHU9Ih9GawSmJ3QqMA3jHt9UOOIArxQ+yjYTNaLck5uw3VX2iOtyH4y/KcHrZul0Kt lOAv03ZMxiSEoglllhIp+Zk6+GUZTgO2k+NLID7nuRJaYz+mHNlWVkNzj1iIFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794222488; 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=Lti9JHeT6p13qJmt2DC6ocwnNtHCvarc4SXjY/8oGq8=; b=gY6/N6Oe8iUozRNSgkGXd20E9Y9hwCV+wuyM6kjsMwpCxbRF8sDNBMxqPAGiIT1PAN32Pv xMgHKHCnClUqLbKGyhJ9O032DzftlQ9GXBXL2xHcelRFIFu/2q1mrYLX9KhlHvrMbotluq SJCIiViBgitLnydGGbASoosqekGDq2j5px/h/ePwVteLv+rG1wIbaJRX3TIVor+xhefUmJ 9dluQHsWX8OcCRczFv1Q3mRdaxzngl+HmQg8pDY3y7I16agrjlbJuM9U2SPX9PsHioN8v/ KbJywjHiJRjdiu40aecA48ze3cK9PzVNf8bikc1dy6xnDiULzSpMdR9DnRcQiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jNRpc4khCzd3L for ; Mon, 09 Nov 2026 11:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fc49 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 11:08:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 2e3ba764b21f - main - wait4(2): add kern_wait4 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e3ba764b21f8f48ea2d48c0118a8f8e2eb4dd41 Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 11:08:08 +0000 Message-Id: <6af1a998.1fc49.6b0dcd93@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=2e3ba764b21f8f48ea2d48c0118a8f8e2eb4dd41 commit 2e3ba764b21f8f48ea2d48c0118a8f8e2eb4dd41 Author: Brooks Davis AuthorDate: 2026-11-09 11:07:57 +0000 Commit: Brooks Davis CommitDate: 2026-11-09 11:07:57 +0000 wait4(2): add kern_wait4 Effort: CHERI upstreaming Sponsored by: Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/kern_exit.c | 20 ++++++++++++++------ sys/sys/syscallsubr.h | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index fa1721fbaede..748164fed948 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -898,19 +898,27 @@ owait(struct thread *td, struct owait_args *uap __unused) */ int sys_wait4(struct thread *td, struct wait4_args *uap) +{ + return (kern_wait4(td, uap->pid, uap->status, uap->options, + uap->rusage)); +} + +int +kern_wait4(struct thread *td, int pid, int *statusp, int options, + struct rusage *rusage) { struct rusage ru, *rup; int error, status; - if (uap->rusage != NULL) + if (rusage != NULL) rup = &ru; else rup = NULL; - error = kern_wait(td, uap->pid, &status, uap->options, rup); - if (uap->status != NULL && error == 0 && td->td_retval[0] != 0) - error = copyout(&status, uap->status, sizeof(status)); - if (uap->rusage != NULL && error == 0 && td->td_retval[0] != 0) - error = copyout(&ru, uap->rusage, sizeof(struct rusage)); + error = kern_wait(td, pid, &status, options, rup); + if (statusp != NULL && error == 0 && td->td_retval[0] != 0) + error = copyout(&status, statusp, sizeof(status)); + if (rusage != NULL && error == 0 && td->td_retval[0] != 0) + error = copyout(&ru, rusage, sizeof(struct rusage)); return (error); } diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 872191c6b3d3..59ec3640d3ff 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -472,6 +472,8 @@ int kern_utimensat(struct thread *td, int fd, const char *path, enum uio_seg tptrseg, int flag); int kern_wait(struct thread *td, pid_t pid, int *status, int options, struct rusage *rup); +int kern_wait4(struct thread *td, int pid, int *statusp, int options, + struct rusage *rusage); int kern_wait6(struct thread *td, enum idtype idtype, id_t id, int *status, int options, struct __wrusage *wrup, siginfo_t *sip); int kern_writev(struct thread *td, int fd, struct uio *auio);