From nobody Tue Nov 10 12:33:03 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 4jP5f75Hlbz6yLt8 for ; Tue, 10 Nov 2026 12:33:03 +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 4jP5f73KS4z4sMW for ; Tue, 10 Nov 2026 12:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794313983; 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=/XUp1sf2HkOXtd+DIctRbgvKsFC8tRYbiTnCF/3qsYY=; b=gVJ2xJys0bQvF8PsPFrGnL6sIDSlYdHQOBWOmFcx+a7gk6tzqxUGO+x9zg3ktVYq7iLM5s QDIbN3xQ40IOuS75PHRAopeW8cezOUR0Gbex4Ewp+Jcg/qxkcjJDDEGodlqocVPjpP0MlB WV6TPrvJOWacJUZfH8y7Th+4WTYqgRhKDVefCRxtuPpA++Dj0Y/CBnbaXegbD6FCO015jB KkWjtHpOYPgICWjNskcsWxdCoUChj7m7f89OKPpyEP2nq6gurx91C2tJpfOwqokJLpjZ/m EVF8j3C1iOaJZJXoy9/DckJbahDcxzbWcrl9KtGYbWXIVSS6l4GdBg0dA/wEdw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794313983; b=wSH0A8YrCq0MnKCEtRJcKYseRQUs4v0odppVdipTb4Gs+oIWtYpU+oxnJAkuuf7418I/Ls dHovvFIffGv1hIzEkQqBBH9bGTTe7m2hKO7vHKh0NOcgPjoDluDpPsn2Tpq48o+LctZC7a 0u5GMM3nc/gYtL+kRmrxRA1H5HHcxF7P5eYBBtKB5LtMCH2BBmRQhiDaKj/zpqXoHJEIFY YnnD4RzauQ39pBzHb4DMFX9eLkLk+eU7tSWCElh4zHgw03/i4Mv9vtLSJr31bhMjhkmtf0 SeqOFs8UJDmXtabtqbaiMmMUtno/oKNTkbfldPkSBcSkaF4DMtagbzstyG2A/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794313983; 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=/XUp1sf2HkOXtd+DIctRbgvKsFC8tRYbiTnCF/3qsYY=; b=MlDkJypz4VZ7qSZwq0XeMhEZMrGUy5KWJnYvlt3XLaTQNFVoGOyAjHmfc1sk8spMkeG3Kf 2IoiVQRUJfjhwpTOySnNIDaDgbxzeYpWerUGDc6F5LM2KNmZK/3zYzVYTLVbYxURT81o7w cnhX2wP9KtbjjLxPdg2F5c0wkLrK1ECambHzq0+XDR0ShH5Uu0MWMveo+x1KcuK5P/1Q5H mKghzNCr+hE2ZIGHPTD3u93Pw2nCbcvYW6nQyKmqe3Euxq5jmwmfCfi5nzSQiCzy/Zycof qcd2Hb/A+e45WcWNtFxH53WazHtui6gP7p4e2O+Yp/9wSR+vxDioi7y/MMdvzA== 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 4jP5f73049zS3c for ; Tue, 10 Nov 2026 12:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 14c9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 12:33:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 52830cb4e63d - main - rctl_*(2): add kern_ implementations List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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: 52830cb4e63d3bfbb1b6243acd98aa9ecb0cffef Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 12:33:03 +0000 Message-Id: <6af30eff.14c9e.6d52860e@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=52830cb4e63d3bfbb1b6243acd98aa9ecb0cffef commit 52830cb4e63d3bfbb1b6243acd98aa9ecb0cffef Author: Brooks Davis AuthorDate: 2026-11-10 11:49:21 +0000 Commit: Brooks Davis CommitDate: 2026-11-10 11:49:21 +0000 rctl_*(2): add kern_ implementations Effort: CHERI upstreaming Sponsored by: Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/kern_rctl.c | 57 ++++++++++++++++++++++++++++++++++++++++++--------- sys/sys/syscallsubr.h | 10 +++++++++ 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c index 682ba86d23ff..cf5cdc098f5a 100644 --- a/sys/kern/kern_rctl.c +++ b/sys/kern/kern_rctl.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -1607,6 +1608,14 @@ rctl_racct_to_sbuf(struct racct *racct, int sloppy) int sys_rctl_get_racct(struct thread *td, struct rctl_get_racct_args *uap) +{ + return (kern_rctl_get_racct(td, uap->inbufp, uap->inbuflen, + uap->outbufp, uap->outbuflen)); +} + +int +kern_rctl_get_racct(struct thread *td, const void *inbufp, size_t inbuflen, + void *outbufp, size_t outbuflen) { struct rctl_rule *filter; struct sbuf *outputsbuf = NULL; @@ -1624,7 +1633,7 @@ sys_rctl_get_racct(struct thread *td, struct rctl_get_racct_args *uap) if (error != 0) return (error); - error = rctl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen); + error = rctl_read_inbuf(&inputstr, inbufp, inbuflen); if (error != 0) return (error); @@ -1678,7 +1687,7 @@ out: if (error != 0) return (error); - error = rctl_write_outbuf(outputsbuf, uap->outbufp, uap->outbuflen); + error = rctl_write_outbuf(outputsbuf, outbufp, outbuflen); return (error); } @@ -1703,6 +1712,14 @@ rctl_get_rules_callback(struct racct *racct, void *arg2, void *arg3) int sys_rctl_get_rules(struct thread *td, struct rctl_get_rules_args *uap) +{ + return (kern_rctl_get_rules(td, uap->inbufp, uap->inbuflen, + uap->outbufp, uap->outbuflen)); +} + +int +kern_rctl_get_rules(struct thread *td, const void *inbufp, size_t inbuflen, + void *outbufp, size_t outbuflen) { struct sbuf *sb; struct rctl_rule *filter; @@ -1719,7 +1736,7 @@ sys_rctl_get_rules(struct thread *td, struct rctl_get_rules_args *uap) if (error != 0) return (error); - error = rctl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen); + error = rctl_read_inbuf(&inputstr, inbufp, inbuflen); if (error != 0) return (error); @@ -1731,7 +1748,7 @@ sys_rctl_get_rules(struct thread *td, struct rctl_get_rules_args *uap) return (error); } - bufsize = uap->outbuflen; + bufsize = outbuflen; if (bufsize > rctl_maxbufsize) { sx_sunlock(&allproc_lock); return (E2BIG); @@ -1779,7 +1796,7 @@ sys_rctl_get_rules(struct thread *td, struct rctl_get_rules_args *uap) if (sbuf_len(sb) > 0) sbuf_setpos(sb, sbuf_len(sb) - 1); - error = rctl_write_outbuf(sb, uap->outbufp, uap->outbuflen); + error = rctl_write_outbuf(sb, outbufp, outbuflen); out: rctl_rule_release(filter); sx_sunlock(&allproc_lock); @@ -1789,6 +1806,14 @@ out: int sys_rctl_get_limits(struct thread *td, struct rctl_get_limits_args *uap) +{ + return (kern_rctl_get_limits(td, uap->inbufp, uap->inbuflen, + uap->outbufp, uap->outbuflen)); +} + +int +kern_rctl_get_limits(struct thread *td, const void *inbufp, size_t inbuflen, + void *outbufp, size_t outbuflen) { struct sbuf *sb; struct rctl_rule *filter; @@ -1804,7 +1829,7 @@ sys_rctl_get_limits(struct thread *td, struct rctl_get_limits_args *uap) if (error != 0) return (error); - error = rctl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen); + error = rctl_read_inbuf(&inputstr, inbufp, inbuflen); if (error != 0) return (error); @@ -1832,7 +1857,7 @@ sys_rctl_get_limits(struct thread *td, struct rctl_get_limits_args *uap) return (EINVAL); } - bufsize = uap->outbuflen; + bufsize = outbuflen; if (bufsize > rctl_maxbufsize) { rctl_rule_release(filter); sx_sunlock(&allproc_lock); @@ -1862,7 +1887,7 @@ sys_rctl_get_limits(struct thread *td, struct rctl_get_limits_args *uap) if (sbuf_len(sb) > 0) sbuf_setpos(sb, sbuf_len(sb) - 1); - error = rctl_write_outbuf(sb, uap->outbufp, uap->outbuflen); + error = rctl_write_outbuf(sb, outbufp, outbuflen); out: rctl_rule_release(filter); sx_sunlock(&allproc_lock); @@ -1872,6 +1897,12 @@ out: int sys_rctl_add_rule(struct thread *td, struct rctl_add_rule_args *uap) +{ + return (kern_rctl_add_rule(td, uap->inbufp, uap->inbuflen)); +} + +int +kern_rctl_add_rule(struct thread *td, const void *inbufp, size_t inbuflen) { struct rctl_rule *rule; char *inputstr; @@ -1884,7 +1915,7 @@ sys_rctl_add_rule(struct thread *td, struct rctl_add_rule_args *uap) if (error != 0) return (error); - error = rctl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen); + error = rctl_read_inbuf(&inputstr, inbufp, inbuflen); if (error != 0) return (error); @@ -1917,6 +1948,12 @@ out: int sys_rctl_remove_rule(struct thread *td, struct rctl_remove_rule_args *uap) +{ + return (kern_rctl_remove_rule(td, uap->inbufp, uap->inbuflen)); +} + +int +kern_rctl_remove_rule(struct thread *td, const void *inbufp, size_t inbuflen) { struct rctl_rule *filter; char *inputstr; @@ -1929,7 +1966,7 @@ sys_rctl_remove_rule(struct thread *td, struct rctl_remove_rule_args *uap) if (error != 0) return (error); - error = rctl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen); + error = rctl_read_inbuf(&inputstr, inbufp, inbuflen); if (error != 0) return (error); diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index fec04660b541..41c1407b7ca4 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -392,6 +392,16 @@ int kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int kern_pwrite(struct thread *td, int fd, const void *buf, size_t nbyte, off_t offset); int kern_pwritev(struct thread *td, int fd, struct uio *auio, off_t offset); +int kern_rctl_add_rule(struct thread *td, const void *inbufp, + size_t inbuflen); +int kern_rctl_get_limits(struct thread *td, const void *inbufp, + size_t inbuflen, void *outbufp, size_t outbuflen); +int kern_rctl_get_racct(struct thread *td, const void *inbufp, + size_t inbuflen, void *outbufp, size_t outbuflen); +int kern_rctl_get_rules(struct thread *td, const void *inbufp, + size_t inbuflen, void *outbufp, size_t outbuflen); +int kern_rctl_remove_rule(struct thread *td, const void *inbufp, + size_t inbuflen); int kern_readlinkat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, size_t count); int kern_readv(struct thread *td, int fd, struct uio *auio);