diff options
author | James Morris <jmorris@namei.org> | 2007-10-17 02:31:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:43:07 -0400 |
commit | 20510f2f4e2dabb0ff6c13901807627ec9452f98 (patch) | |
tree | d64b9eeb90d577f7f9688a215c4c6c3c2405188a /security/capability.c | |
parent | 5c3b447457789374cdb7b03afe2540d48c649a36 (diff) |
security: Convert LSM into a static interface
Convert LSM into a static interface, as the ability to unload a security
module is not required by in-tree users and potentially complicates the
overall security architecture.
Needlessly exported LSM symbols have been unexported, to help reduce API
abuse.
Parameters for the capability and root_plug modules are now specified
at boot.
The SECURITY_FRAMEWORK_VERSION macro has also been removed.
In a nutshell, there is no safe way to unload an LSM. The modular interface
is thus unecessary and broken infrastructure. It is used only by out-of-tree
modules, which are often binary-only, illegal, abusive of the API and
dangerous, e.g. silently re-vectoring SELinux.
[akpm@linux-foundation.org: cleanups]
[akpm@linux-foundation.org: USB Kconfig fix]
[randy.dunlap@oracle.com: fix LSM kernel-doc]
Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Chris Wright <chrisw@sous-sol.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: "Serge E. Hallyn" <serue@us.ibm.com>
Acked-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/capability.c')
-rw-r--r-- | security/capability.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/security/capability.c b/security/capability.c index 38296a005465..fda6a14cb24d 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -8,7 +8,6 @@ | |||
8 | * | 8 | * |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/module.h> | ||
12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
14 | #include <linux/security.h> | 13 | #include <linux/security.h> |
@@ -52,7 +51,6 @@ static int secondary; | |||
52 | 51 | ||
53 | static int capability_disable; | 52 | static int capability_disable; |
54 | module_param_named(disable, capability_disable, int, 0); | 53 | module_param_named(disable, capability_disable, int, 0); |
55 | MODULE_PARM_DESC(disable, "To disable capabilities module set disable = 1"); | ||
56 | 54 | ||
57 | static int __init capability_init (void) | 55 | static int __init capability_init (void) |
58 | { | 56 | { |
@@ -75,26 +73,4 @@ static int __init capability_init (void) | |||
75 | return 0; | 73 | return 0; |
76 | } | 74 | } |
77 | 75 | ||
78 | static void __exit capability_exit (void) | ||
79 | { | ||
80 | if (capability_disable) | ||
81 | return; | ||
82 | /* remove ourselves from the security framework */ | ||
83 | if (secondary) { | ||
84 | if (mod_unreg_security (KBUILD_MODNAME, &capability_ops)) | ||
85 | printk (KERN_INFO "Failure unregistering capabilities " | ||
86 | "with primary module.\n"); | ||
87 | return; | ||
88 | } | ||
89 | |||
90 | if (unregister_security (&capability_ops)) { | ||
91 | printk (KERN_INFO | ||
92 | "Failure unregistering capabilities with the kernel\n"); | ||
93 | } | ||
94 | } | ||
95 | |||
96 | security_initcall (capability_init); | 76 | security_initcall (capability_init); |
97 | module_exit (capability_exit); | ||
98 | |||
99 | MODULE_DESCRIPTION("Standard Linux Capabilities Security Module"); | ||
100 | MODULE_LICENSE("GPL"); | ||