diff options
| -rw-r--r-- | sys/kern/kern_mac.c | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_framework.c | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_internal.h | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_net.c | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_pipe.c | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_policy.h | 1 | ||||
| -rw-r--r-- | sys/security/mac/mac_process.c | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_syscalls.c | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_system.c | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_vfs.c | 8 | ||||
| -rw-r--r-- | sys/sys/mac_policy.h | 1 |
11 files changed, 74 insertions, 0 deletions
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index 6544f01..547647c 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -54,6 +54,7 @@ #include <sys/mutex.h> #include <sys/sx.h> #include <sys/mac.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -87,6 +88,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 6544f01..547647c 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -54,6 +54,7 @@ #include <sys/mutex.h> #include <sys/sx.h> #include <sys/mac.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -87,6 +88,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index 6544f01..547647c 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -54,6 +54,7 @@ #include <sys/mutex.h> #include <sys/sx.h> #include <sys/mac.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -87,6 +88,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index 6544f01..547647c 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -54,6 +54,7 @@ #include <sys/mutex.h> #include <sys/sx.h> #include <sys/mac.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -87,6 +88,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index 6544f01..547647c 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -54,6 +54,7 @@ #include <sys/mutex.h> #include <sys/sx.h> #include <sys/mac.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -87,6 +88,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h index f38c017..7d279aa 100644 --- a/sys/security/mac/mac_policy.h +++ b/sys/security/mac/mac_policy.h @@ -481,6 +481,7 @@ struct mac_policy_conf { mac_policy_modevent, \ &mpname##_mac_policy_conf \ }; \ + MODULE_DEPEND(mpname, kernel_mac_support, 1, 1, 1); \ DECLARE_MODULE(mpname, mpname##_mod, SI_SUB_MAC_POLICY, \ SI_ORDER_MIDDLE) diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index 6544f01..547647c 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -54,6 +54,7 @@ #include <sys/mutex.h> #include <sys/sx.h> #include <sys/mac.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -87,6 +88,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 6544f01..547647c 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -54,6 +54,7 @@ #include <sys/mutex.h> #include <sys/sx.h> #include <sys/mac.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -87,6 +88,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index 6544f01..547647c 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -54,6 +54,7 @@ #include <sys/mutex.h> #include <sys/sx.h> #include <sys/mac.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -87,6 +88,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index 6544f01..547647c 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -54,6 +54,7 @@ #include <sys/mutex.h> #include <sys/sx.h> #include <sys/mac.h> +#include <sys/module.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -87,6 +88,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, diff --git a/sys/sys/mac_policy.h b/sys/sys/mac_policy.h index f38c017..7d279aa 100644 --- a/sys/sys/mac_policy.h +++ b/sys/sys/mac_policy.h @@ -481,6 +481,7 @@ struct mac_policy_conf { mac_policy_modevent, \ &mpname##_mac_policy_conf \ }; \ + MODULE_DEPEND(mpname, kernel_mac_support, 1, 1, 1); \ DECLARE_MODULE(mpname, mpname##_mod, SI_SUB_MAC_POLICY, \ SI_ORDER_MIDDLE) |
