summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/kern/kern_environment.c24
-rw-r--r--sys/kern/kern_mac.c52
-rw-r--r--sys/security/mac/mac_framework.c52
-rw-r--r--sys/security/mac/mac_framework.h4
-rw-r--r--sys/security/mac/mac_internal.h52
-rw-r--r--sys/security/mac/mac_net.c52
-rw-r--r--sys/security/mac/mac_pipe.c52
-rw-r--r--sys/security/mac/mac_policy.h5
-rw-r--r--sys/security/mac/mac_process.c52
-rw-r--r--sys/security/mac/mac_syscalls.c52
-rw-r--r--sys/security/mac/mac_system.c52
-rw-r--r--sys/security/mac/mac_vfs.c52
-rw-r--r--sys/sys/mac.h4
-rw-r--r--sys/sys/mac_policy.h5
14 files changed, 509 insertions, 1 deletions
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index e4d308b510f0..04f00c3a8199 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -36,11 +36,14 @@
* the kernel.
*/
+#include "opt_mac.h"
+
#include <sys/types.h>
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/lock.h>
+#include <sys/mac.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/kernel.h>
@@ -90,6 +93,11 @@ kenv(td, uap)
error = 0;
if (SCARG(uap, what) == KENV_DUMP) {
+#ifdef MAC
+ error = mac_check_kenv_dump(td->td_ucred);
+ if (error)
+ return (error);
+#endif
len = 0;
/* Return the size if called with a NULL buffer */
if (SCARG(uap, value) == NULL) {
@@ -131,6 +139,11 @@ kenv(td, uap)
switch (SCARG(uap, what)) {
case KENV_GET:
+#ifdef MAC
+ error = mac_check_kenv_get(td->td_ucred, name);
+ if (error)
+ goto done;
+#endif
value = getenv(name);
if (value == NULL) {
error = ENOENT;
@@ -159,10 +172,19 @@ kenv(td, uap)
free(value, M_TEMP);
goto done;
}
- setenv(name, value);
+#ifdef MAC
+ error = mac_check_kenv_set(td->td_ucred, name, value);
+ if (error == 0)
+#endif
+ setenv(name, value);
free(value, M_TEMP);
break;
case KENV_UNSET:
+#ifdef MAC
+ error = mac_check_kenv_unset(td->td_ucred, name);
+ if (error)
+ goto done;
+#endif
error = unsetenv(name);
if (error)
error = ENOENT;
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c
index 4882c0f46d2c..f4cfa8ab2fc1 100644
--- a/sys/kern/kern_mac.c
+++ b/sys/kern/kern_mac.c
@@ -2170,6 +2170,58 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
}
int
+mac_check_kenv_dump(struct ucred *cred)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_dump, cred);
+
+ return (error);
+}
+
+int
+mac_check_kenv_get(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_get, cred, name);
+
+ return (error);
+}
+
+int
+mac_check_kenv_set(struct ucred *cred, char *name, char *value)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_set, cred, name, value);
+
+ return (error);
+}
+
+int
+mac_check_kenv_unset(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_unset, cred, name);
+
+ return (error);
+}
+
+int
mac_check_mount_stat(struct ucred *cred, struct mount *mount)
{
int error;
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index 4882c0f46d2c..f4cfa8ab2fc1 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -2170,6 +2170,58 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
}
int
+mac_check_kenv_dump(struct ucred *cred)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_dump, cred);
+
+ return (error);
+}
+
+int
+mac_check_kenv_get(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_get, cred, name);
+
+ return (error);
+}
+
+int
+mac_check_kenv_set(struct ucred *cred, char *name, char *value)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_set, cred, name, value);
+
+ return (error);
+}
+
+int
+mac_check_kenv_unset(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_unset, cred, name);
+
+ return (error);
+}
+
+int
mac_check_mount_stat(struct ucred *cred, struct mount *mount)
{
int error;
diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h
index 9a6a5f4b87c1..e50aaa7a97ed 100644
--- a/sys/security/mac/mac_framework.h
+++ b/sys/security/mac/mac_framework.h
@@ -230,6 +230,10 @@ void mac_thread_userret(struct thread *td);
int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet);
int mac_check_cred_visible(struct ucred *u1, struct ucred *u2);
int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m);
+int mac_check_kenv_dump(struct ucred *cred);
+int mac_check_kenv_get(struct ucred *cred, char *name);
+int mac_check_kenv_set(struct ucred *cred, char *name, char *value);
+int mac_check_kenv_unset(struct ucred *cred, char *name);
int mac_check_mount_stat(struct ucred *cred, struct mount *mp);
int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe,
unsigned long cmd, void *data);
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 4882c0f46d2c..f4cfa8ab2fc1 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -2170,6 +2170,58 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
}
int
+mac_check_kenv_dump(struct ucred *cred)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_dump, cred);
+
+ return (error);
+}
+
+int
+mac_check_kenv_get(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_get, cred, name);
+
+ return (error);
+}
+
+int
+mac_check_kenv_set(struct ucred *cred, char *name, char *value)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_set, cred, name, value);
+
+ return (error);
+}
+
+int
+mac_check_kenv_unset(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_unset, cred, name);
+
+ return (error);
+}
+
+int
mac_check_mount_stat(struct ucred *cred, struct mount *mount)
{
int error;
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index 4882c0f46d2c..f4cfa8ab2fc1 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -2170,6 +2170,58 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
}
int
+mac_check_kenv_dump(struct ucred *cred)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_dump, cred);
+
+ return (error);
+}
+
+int
+mac_check_kenv_get(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_get, cred, name);
+
+ return (error);
+}
+
+int
+mac_check_kenv_set(struct ucred *cred, char *name, char *value)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_set, cred, name, value);
+
+ return (error);
+}
+
+int
+mac_check_kenv_unset(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_unset, cred, name);
+
+ return (error);
+}
+
+int
mac_check_mount_stat(struct ucred *cred, struct mount *mount)
{
int error;
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 4882c0f46d2c..f4cfa8ab2fc1 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -2170,6 +2170,58 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
}
int
+mac_check_kenv_dump(struct ucred *cred)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_dump, cred);
+
+ return (error);
+}
+
+int
+mac_check_kenv_get(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_get, cred, name);
+
+ return (error);
+}
+
+int
+mac_check_kenv_set(struct ucred *cred, char *name, char *value)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_set, cred, name, value);
+
+ return (error);
+}
+
+int
+mac_check_kenv_unset(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_unset, cred, name);
+
+ return (error);
+}
+
+int
mac_check_mount_stat(struct ucred *cred, struct mount *mount)
{
int error;
diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h
index bf58634527e7..7be466f24117 100644
--- a/sys/security/mac/mac_policy.h
+++ b/sys/security/mac/mac_policy.h
@@ -269,6 +269,11 @@ struct mac_policy_ops {
int (*mpo_check_ifnet_transmit)(struct ifnet *ifnet,
struct label *ifnetlabel, struct mbuf *m,
struct label *mbuflabel);
+ int (*mpo_check_kenv_dump)(struct ucred *cred);
+ int (*mpo_check_kenv_get)(struct ucred *cred, char *name);
+ int (*mpo_check_kenv_set)(struct ucred *cred, char *name,
+ char *value);
+ int (*mpo_check_kenv_unset)(struct ucred *cred, char *name);
int (*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp,
struct label *mntlabel);
int (*mpo_check_pipe_ioctl)(struct ucred *cred, struct pipe *pipe,
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index 4882c0f46d2c..f4cfa8ab2fc1 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -2170,6 +2170,58 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
}
int
+mac_check_kenv_dump(struct ucred *cred)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_dump, cred);
+
+ return (error);
+}
+
+int
+mac_check_kenv_get(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_get, cred, name);
+
+ return (error);
+}
+
+int
+mac_check_kenv_set(struct ucred *cred, char *name, char *value)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_set, cred, name, value);
+
+ return (error);
+}
+
+int
+mac_check_kenv_unset(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_unset, cred, name);
+
+ return (error);
+}
+
+int
mac_check_mount_stat(struct ucred *cred, struct mount *mount)
{
int error;
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index 4882c0f46d2c..f4cfa8ab2fc1 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -2170,6 +2170,58 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
}
int
+mac_check_kenv_dump(struct ucred *cred)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_dump, cred);
+
+ return (error);
+}
+
+int
+mac_check_kenv_get(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_get, cred, name);
+
+ return (error);
+}
+
+int
+mac_check_kenv_set(struct ucred *cred, char *name, char *value)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_set, cred, name, value);
+
+ return (error);
+}
+
+int
+mac_check_kenv_unset(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_unset, cred, name);
+
+ return (error);
+}
+
+int
mac_check_mount_stat(struct ucred *cred, struct mount *mount)
{
int error;
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 4882c0f46d2c..f4cfa8ab2fc1 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -2170,6 +2170,58 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
}
int
+mac_check_kenv_dump(struct ucred *cred)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_dump, cred);
+
+ return (error);
+}
+
+int
+mac_check_kenv_get(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_get, cred, name);
+
+ return (error);
+}
+
+int
+mac_check_kenv_set(struct ucred *cred, char *name, char *value)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_set, cred, name, value);
+
+ return (error);
+}
+
+int
+mac_check_kenv_unset(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_unset, cred, name);
+
+ return (error);
+}
+
+int
mac_check_mount_stat(struct ucred *cred, struct mount *mount)
{
int error;
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 4882c0f46d2c..f4cfa8ab2fc1 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -2170,6 +2170,58 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
}
int
+mac_check_kenv_dump(struct ucred *cred)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_dump, cred);
+
+ return (error);
+}
+
+int
+mac_check_kenv_get(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_get, cred, name);
+
+ return (error);
+}
+
+int
+mac_check_kenv_set(struct ucred *cred, char *name, char *value)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_set, cred, name, value);
+
+ return (error);
+}
+
+int
+mac_check_kenv_unset(struct ucred *cred, char *name)
+{
+ int error;
+
+ if (!mac_enforce_system)
+ return (0);
+
+ MAC_CHECK(check_kenv_unset, cred, name);
+
+ return (error);
+}
+
+int
mac_check_mount_stat(struct ucred *cred, struct mount *mount)
{
int error;
diff --git a/sys/sys/mac.h b/sys/sys/mac.h
index 9a6a5f4b87c1..e50aaa7a97ed 100644
--- a/sys/sys/mac.h
+++ b/sys/sys/mac.h
@@ -230,6 +230,10 @@ void mac_thread_userret(struct thread *td);
int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet);
int mac_check_cred_visible(struct ucred *u1, struct ucred *u2);
int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m);
+int mac_check_kenv_dump(struct ucred *cred);
+int mac_check_kenv_get(struct ucred *cred, char *name);
+int mac_check_kenv_set(struct ucred *cred, char *name, char *value);
+int mac_check_kenv_unset(struct ucred *cred, char *name);
int mac_check_mount_stat(struct ucred *cred, struct mount *mp);
int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe,
unsigned long cmd, void *data);
diff --git a/sys/sys/mac_policy.h b/sys/sys/mac_policy.h
index bf58634527e7..7be466f24117 100644
--- a/sys/sys/mac_policy.h
+++ b/sys/sys/mac_policy.h
@@ -269,6 +269,11 @@ struct mac_policy_ops {
int (*mpo_check_ifnet_transmit)(struct ifnet *ifnet,
struct label *ifnetlabel, struct mbuf *m,
struct label *mbuflabel);
+ int (*mpo_check_kenv_dump)(struct ucred *cred);
+ int (*mpo_check_kenv_get)(struct ucred *cred, char *name);
+ int (*mpo_check_kenv_set)(struct ucred *cred, char *name,
+ char *value);
+ int (*mpo_check_kenv_unset)(struct ucred *cred, char *name);
int (*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp,
struct label *mntlabel);
int (*mpo_check_pipe_ioctl)(struct ucred *cred, struct pipe *pipe,
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-01 09:59:49 +0000