git: 52830cb4e63d - main - rctl_*(2): add kern_ implementations
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 10 Nov 2026 12:33:03 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=52830cb4e63d3bfbb1b6243acd98aa9ecb0cffef
commit 52830cb4e63d3bfbb1b6243acd98aa9ecb0cffef
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2026-11-10 11:49:21 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
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 <sys/rctl.h>
#include <sys/resourcevar.h>
#include <sys/sx.h>
+#include <sys/syscallsubr.h>
#include <sys/sysproto.h>
#include <sys/systm.h>
#include <sys/types.h>
@@ -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);