git: 4ca929100407 - main - kenv(2): add kern_kenv
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 07 Nov 2026 12:11:05 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=4ca929100407f62aba146aa04bb0c8c44d1fe292
commit 4ca929100407f62aba146aa04bb0c8c44d1fe292
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2026-11-07 12:10:46 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2026-11-07 12:10:46 +0000
kenv(2): add kern_kenv
Effort: CHERI upstreaming
Sponsored by: Innovate UK
Pull Request: https://github.com/freebsd/freebsd-src/pull/2284
---
sys/kern/kern_environment.c | 36 ++++++++++++++++++++++--------------
sys/sys/syscallsubr.h | 2 ++
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index b348f318785e..797b904f431e 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -49,6 +49,7 @@
#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/queue.h>
+#include <sys/syscallsubr.h>
#include <sys/sysctl.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>
@@ -190,6 +191,13 @@ kenv_read_allowed(struct thread *td, int which)
int
sys_kenv(struct thread *td, struct kenv_args *uap)
+{
+ return (kern_kenv(td, uap->what, uap->name, uap->value, uap->len));
+}
+
+int
+kern_kenv(struct thread *td, int what, const char *namep, char *u_val,
+ int u_len)
{
char *name, *value;
size_t len;
@@ -199,21 +207,21 @@ sys_kenv(struct thread *td, struct kenv_args *uap)
error = 0;
- switch (uap->what) {
+ switch (what) {
case KENV_DUMP:
- error = kenv_read_allowed(td, uap->what);
+ error = kenv_read_allowed(td, what);
if (error)
return (error);
- return (kenv_dump(td, kenvp, uap->what, uap->value, uap->len));
+ return (kenv_dump(td, kenvp, what, u_val, u_len));
case KENV_DUMP_LOADER:
case KENV_DUMP_STATIC:
- error = kenv_read_allowed(td, uap->what);
+ error = kenv_read_allowed(td, what);
if (error)
return (error);
#ifdef PRESERVE_EARLY_KENV
return (kenv_dump(td,
- uap->what == KENV_DUMP_LOADER ? (char **)md_envp :
- (char **)kern_envp, uap->what, uap->value, uap->len));
+ what == KENV_DUMP_LOADER ? (char **)md_envp :
+ (char **)kern_envp, what, u_val, u_len));
#else
return (ENOENT);
#endif
@@ -229,7 +237,7 @@ sys_kenv(struct thread *td, struct kenv_args *uap)
return (error);
break;
case KENV_GET:
- error = kenv_read_allowed(td, uap->what);
+ error = kenv_read_allowed(td, what);
if (error)
return (error);
break;
@@ -237,11 +245,11 @@ sys_kenv(struct thread *td, struct kenv_args *uap)
name = malloc(KENV_MNAMELEN + 1, M_TEMP, M_WAITOK);
- error = copyinstr(uap->name, name, KENV_MNAMELEN + 1, NULL);
+ error = copyinstr(namep, name, KENV_MNAMELEN + 1, NULL);
if (error)
goto done;
- switch (uap->what) {
+ switch (what) {
case KENV_GET:
#ifdef MAC
error = mac_kenv_check_get(td->td_ucred, name);
@@ -254,16 +262,16 @@ sys_kenv(struct thread *td, struct kenv_args *uap)
goto done;
}
len = strlen(value) + 1;
- if (len > uap->len)
- len = uap->len;
- error = copyout(value, uap->value, len);
+ if (len > u_len)
+ len = u_len;
+ error = copyout(value, u_val, len);
freeenv(value);
if (error)
goto done;
td->td_retval[0] = len;
break;
case KENV_SET:
- len = uap->len;
+ len = u_len;
if (len < 1) {
error = EINVAL;
goto done;
@@ -271,7 +279,7 @@ sys_kenv(struct thread *td, struct kenv_args *uap)
if (len > kenv_mvallen + 1)
len = kenv_mvallen + 1;
value = malloc(len, M_TEMP, M_WAITOK);
- error = copyinstr(uap->value, value, len, NULL);
+ error = copyinstr(u_val, value, len, NULL);
if (error) {
free(value, M_TEMP);
goto done;
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index 7c53dcc2d658..1fb47633be11 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -252,6 +252,8 @@ int kern_jail_get(struct thread *td, struct uio *options, int flags);
int kern_jail_set(struct thread *td, struct uio *options, int flags);
int kern_kcmp(struct thread *td, pid_t pid1, pid_t pid2, int type,
uintptr_t idx1, uintptr_t idx2);
+int kern_kenv(struct thread *td, int what, const char *namep, char *val,
+ int vallen);
int kern_kevent(struct thread *td, int fd, int nchanges, int nevents,
struct kevent_copyops *k_ops, const struct timespec *timeout);
int kern_kevent_anonymous(struct thread *td, int nevents,