From nobody Mon Nov 09 11:08:09 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 4jNRpf5BLMz6yH3J for ; Mon, 09 Nov 2026 11:08:10 +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 4jNRpd5Vsvz3DpV for ; Mon, 09 Nov 2026 11:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794222489; 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=/j/n5n6SSUNRQRuwrU3Ec5dI3Li+GTBzRq1BPLgRExo=; b=mgvbQuBcL+dVweHTmkixXWCNlJIxz/E0goaCmfWhOoi/HSB4dmTr5OXBhFVm3i9btUIaYj Pl+4qQU+H3Ywg3aATVZRfvXQcaWrPiN79PKpzcJxYTtwlH9UCdbd7+36n1YAZAopUVi32N 84Dn0peoTK3Q1+uM90ls5Vj3F6EYBiCFYtH3eK8ibodXHn7S9M3i9UzYiN/dKX5c0qOTA5 KLnedMB/KBknIgBL8ogqJgoWpmKEIJ4uRC8hjdugV+V2o7pJy5ZCk+sknM+fZYoVWpXdCF h0h+BrYNVDxSu+JFcV2xFV+K0Xxq+GAbNBcENuIDX1z8sVarHW1j/iNR5G01Mw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794222489; b=v3ThhyLlK5R1nXP9us18n+csqYOhLE10n5DoYf7L7v/O6zH5PCi8xNM25emjrkVUA1tAMt qem28ZCoMn9w/BGEqcgW0JO7P8gY+p0XceWPkZPaWXBvXFhR9VEQcCd0ffD+s5gQVQIY5E eB0x1babG6YQnzy4422ZldxX2p3SFVOxJxnpyVb37tu7ZeoJrIKR/d5E0u4HViS1rD5KXW MkHwFTQcKZV7o3KqmM+JJ6TQi7nmBAN8SOVKjuCBao8q+XqOD5EOAEE49W3imXjMxaKmBs Fg6s98yCQ8yF4TWOeYYwFSo8pRFYPqTk98wrwwLpR6kscvc5hNTXcnHW+/wP2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794222489; 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=/j/n5n6SSUNRQRuwrU3Ec5dI3Li+GTBzRq1BPLgRExo=; b=PhlSz9T/36Sh+QToY+sDbt+PUB1SugmwINbFlN1gZdi054XoWS6qUmrq6r0dl3JLkHhYRp nDbHgrmMHQFs5DDp9/DckAGZnnKzJLH+mHThjfT/EQAnJ8ZUzOVLQrSfPVLdq/8tUR+8LX WOa/xgvn9XxAvLuv+xUjpIpzL9fSn7Rfpl4aKrSRUm3rcW61DgiQbxOPEO58voe4W5sZEz gq191P9hZRT3IvMkCpTXZ8BlVlijkz7iAY4leOgRl+hojP8ZHU+iG4te6kLtHN9XxHHbg9 jf0Vp/nJqbWJQNzcGj9CXlPDdKcQy6eFgWPXdkfuUC3TjLbW6IwbbLNBNoa/ew== 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 4jNRpd51d2zd3r for ; Mon, 09 Nov 2026 11:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ca3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 11:08:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 52bd0d1812b6 - main - wait6(2): add user_wait6 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: 52bd0d1812b6c3fb31db9709ff56393fb082046c Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 11:08:09 +0000 Message-Id: <6af1a999.ca3.6d90d31b@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=52bd0d1812b6c3fb31db9709ff56393fb082046c commit 52bd0d1812b6c3fb31db9709ff56393fb082046c Author: Brooks Davis AuthorDate: 2026-11-09 11:07:57 +0000 Commit: Brooks Davis CommitDate: 2026-11-09 11:07:57 +0000 wait6(2): add user_wait6 sys_wait6 is a little more complicated than typical as compat layers need to translate siginfo_t. Effort: CHERI upstreaming Sponsored by: Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/kern_exit.c | 43 ++++++++++++++++++++++++------------------- sys/sys/syscallsubr.h | 3 +++ 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 748164fed948..f4d7d50c7d23 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -925,38 +925,43 @@ kern_wait4(struct thread *td, int pid, int *statusp, int options, int sys_wait6(struct thread *td, struct wait6_args *uap) { - struct __wrusage wru, *wrup; siginfo_t si, *sip; - idtype_t idtype; - id_t id; - int error, status; - - idtype = uap->idtype; - id = uap->id; - - if (uap->wrusage != NULL) - wrup = &wru; - else - wrup = NULL; + int error; if (uap->info != NULL) { sip = &si; bzero(sip, sizeof(*sip)); } else sip = NULL; + error = user_wait6(td, uap->idtype, uap->id, uap->status, uap->options, + uap->wrusage, sip); + if (uap->info != NULL && error == 0) + error = copyout(&si, uap->info, sizeof(si)); + return (error); +} + +int +user_wait6(struct thread *td, idtype_t idtype, id_t id, int *statusp, + int options, struct __wrusage *wrusage, siginfo_t *sip) +{ + struct __wrusage wru, *wrup; + int error, status; + + if (wrusage != NULL) + wrup = &wru; + else + wrup = NULL; /* * We expect all callers of wait6() to know about WEXITED and * WTRAPPED. */ - error = kern_wait6(td, idtype, id, &status, uap->options, wrup, sip); + error = kern_wait6(td, idtype, id, &status, options, wrup, sip); - if (uap->status != NULL && error == 0 && td->td_retval[0] != 0) - error = copyout(&status, uap->status, sizeof(status)); - if (uap->wrusage != NULL && error == 0 && td->td_retval[0] != 0) - error = copyout(&wru, uap->wrusage, sizeof(wru)); - if (uap->info != NULL && error == 0) - error = copyout(&si, uap->info, sizeof(si)); + if (statusp != NULL && error == 0 && td->td_retval[0] != 0) + error = copyout(&status, statusp, sizeof(status)); + if (wrusage != NULL && error == 0 && td->td_retval[0] != 0) + error = copyout(&wru, wrusage, sizeof(wru)); return (error); } diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 59ec3640d3ff..1f58fd06cb0b 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -493,6 +493,9 @@ int user_jail_get(struct thread *td, struct iovec *iovp, updateiov_t *updateiov_f); int user_jail_set(struct thread *td, struct iovec *iovp, unsigned int iovcnt, int flags, copyinuio_t *copyinuio_f); +int user_wait6(struct thread *td, enum idtype idtype, id_t id, + int *statusp, int options, struct __wrusage *wrusage, + siginfo_t *sip); /* flags for kern_sigaction */ #define KSA_OSIGSET 0x0001 /* uses osigact_t */