LSM/SELinux: Interfaces to allow FS to control mount options

[sfrench/cifs-2.6.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index f9b35cc0b248f4ed49146651930fc49cad3b65d5..9e99f36a8b5c1f023533c0fab0ee0530e021075a 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -8,8 +8,6 @@
  *
  */
 
-#include <linux/config.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/security.h>
@@ -18,7 +16,6 @@
 #include <linux/mman.h>
 #include <linux/pagemap.h>
 #include <linux/swap.h>
-#include <linux/smp_lock.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/ptrace.h>
@@ -40,7 +37,13 @@ static struct security_operations capability_ops = {
 
        .inode_setxattr =               cap_inode_setxattr,
        .inode_removexattr =            cap_inode_removexattr,
+       .inode_need_killpriv =          cap_inode_need_killpriv,
+       .inode_killpriv =               cap_inode_killpriv,
 
+       .task_kill =                    cap_task_kill,
+       .task_setscheduler =            cap_task_setscheduler,
+       .task_setioprio =               cap_task_setioprio,
+       .task_setnice =                 cap_task_setnice,
        .task_post_setuid =             cap_task_post_setuid,
        .task_reparent_to_init =        cap_task_reparent_to_init,
 
@@ -54,7 +57,6 @@ static int secondary;
 
 static int capability_disable;
 module_param_named(disable, capability_disable, int, 0);
-MODULE_PARM_DESC(disable, "To disable capabilities module set disable = 1");
 
 static int __init capability_init (void)
 {
@@ -77,26 +79,4 @@ static int __init capability_init (void)
        return 0;
 }
 
-static void __exit capability_exit (void)
-{
-       if (capability_disable)
-               return;
-       /* remove ourselves from the security framework */
-       if (secondary) {
-               if (mod_unreg_security (KBUILD_MODNAME, &capability_ops))
-                       printk (KERN_INFO "Failure unregistering capabilities "
-                               "with primary module.\n");
-               return;
-       }
-
-       if (unregister_security (&capability_ops)) {
-               printk (KERN_INFO
-                       "Failure unregistering capabilities with the kernel\n");
-       }
-}
-
 security_initcall (capability_init);
-module_exit (capability_exit);
-
-MODULE_DESCRIPTION("Standard Linux Capabilities Security Module");
-MODULE_LICENSE("GPL");