1 files changed, 7 insertions, 0 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index a2f7e9cf78c5..f9927f02bc3d 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5295,6 +5295,8 @@ static int selinux_key_permission(key_ref_t key_ref,
 #endif
 
 static struct security_operations selinux_ops = {
+        .name =                         "selinux",
+
         .ptrace =                       selinux_ptrace,
         .capget =                       selinux_capget,
         .capset_check =                 selinux_capset_check,
@@ -5492,6 +5494,11 @@ static __init int selinux_init(void)
 {
         struct task_security_struct *tsec;
 
+        if (!security_module_enable(&selinux_ops)) {
+                selinux_enabled = 0;
+                return 0;
+        }
+
         if (!selinux_enabled) {
                 printk(KERN_INFO "SELinux:  Disabled at boot.\n");
                 return 0;