diff options
author | James Morris <jmorris@namei.org> | 2008-07-10 04:02:07 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-07-14 01:04:06 -0400 |
commit | 6f0f0fd496333777d53daff21a4e3b28c4d03a6d (patch) | |
tree | 202de67376fce2547b44ae5b016d6424c3c7409c /security/root_plug.c | |
parent | 93cbace7a058bce7f99319ef6ceff4b78cf45051 (diff) |
security: remove register_security hook
The register security hook is no longer required, as the capability
module is always registered. LSMs wishing to stack capability as
a secondary module should do so explicitly.
Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'security/root_plug.c')
-rw-r--r-- | security/root_plug.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/security/root_plug.c b/security/root_plug.c index a41cf42a4fa0..be0ebec2580b 100644 --- a/security/root_plug.c +++ b/security/root_plug.c | |||
@@ -28,9 +28,6 @@ | |||
28 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
29 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
30 | 30 | ||
31 | /* flag to keep track of how we were registered */ | ||
32 | static int secondary; | ||
33 | |||
34 | /* default is a generic type of usb to serial converter */ | 31 | /* default is a generic type of usb to serial converter */ |
35 | static int vendor_id = 0x0557; | 32 | static int vendor_id = 0x0557; |
36 | static int product_id = 0x2008; | 33 | static int product_id = 0x2008; |
@@ -97,13 +94,7 @@ static int __init rootplug_init (void) | |||
97 | if (register_security (&rootplug_security_ops)) { | 94 | if (register_security (&rootplug_security_ops)) { |
98 | printk (KERN_INFO | 95 | printk (KERN_INFO |
99 | "Failure registering Root Plug module with the kernel\n"); | 96 | "Failure registering Root Plug module with the kernel\n"); |
100 | /* try registering with primary module */ | ||
101 | if (mod_reg_security (MY_NAME, &rootplug_security_ops)) { | ||
102 | printk (KERN_INFO "Failure registering Root Plug " | ||
103 | " module with primary security module.\n"); | ||
104 | return -EINVAL; | 97 | return -EINVAL; |
105 | } | ||
106 | secondary = 1; | ||
107 | } | 98 | } |
108 | printk (KERN_INFO "Root Plug module initialized, " | 99 | printk (KERN_INFO "Root Plug module initialized, " |
109 | "vendor_id = %4.4x, product id = %4.4x\n", vendor_id, product_id); | 100 | "vendor_id = %4.4x, product id = %4.4x\n", vendor_id, product_id); |