diff options
| author | James Morris <jmorris@namei.org> | 2008-07-10 17:02:07 +0900 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-07-14 15:04:06 +1000 |
| commit | 6f0f0fd496333777d53daff21a4e3b28c4d03a6d (patch) | |
| tree | 202de67376fce2547b44ae5b016d6424c3c7409c /security/root_plug.c | |
| parent | 93cbace7a058bce7f99319ef6ceff4b78cf45051 (diff) | |
| download | op-kernel-dev-6f0f0fd496333777d53daff21a4e3b28c4d03a6d.zip op-kernel-dev-6f0f0fd496333777d53daff21a4e3b28c4d03a6d.tar.gz | |
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 a41cf42..be0ebec 100644 --- a/security/root_plug.c +++ b/security/root_plug.c @@ -28,9 +28,6 @@ #include <linux/usb.h> #include <linux/moduleparam.h> -/* flag to keep track of how we were registered */ -static int secondary; - /* default is a generic type of usb to serial converter */ static int vendor_id = 0x0557; static int product_id = 0x2008; @@ -97,13 +94,7 @@ static int __init rootplug_init (void) if (register_security (&rootplug_security_ops)) { printk (KERN_INFO "Failure registering Root Plug module with the kernel\n"); - /* try registering with primary module */ - if (mod_reg_security (MY_NAME, &rootplug_security_ops)) { - printk (KERN_INFO "Failure registering Root Plug " - " module with primary security module.\n"); return -EINVAL; - } - secondary = 1; } printk (KERN_INFO "Root Plug module initialized, " "vendor_id = %4.4x, product id = %4.4x\n", vendor_id, product_id); |
