From: Viktor Rosendahl Date: Thu, 11 Sep 2008 16:20:42 +0000 (+0300) Subject: lowmem: Remove the possibility to stack the module X-Git-Tag: v2.6.27-omap1~197 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9d09a2fdeb043f6595b34585b2df39f6a6767330;p=linux-2.6-omap-h63xx.git lowmem: Remove the possibility to stack the module The mod_reg_security() function that is used to stack modules has been removed: "LSMs wishing to stack capability as a secondary module should do so explicitly". Thus, let's remove the possibility to stack in the init function. The functionality could probably be reintroduced later if somebody has time to implement it. Signed-off-by: Viktor Rosendahl Signed-off-by: Tony Lindgren --- diff --git a/security/lowmem.c b/security/lowmem.c index b9860709c81..ae78a530af3 100644 --- a/security/lowmem.c +++ b/security/lowmem.c @@ -340,8 +340,6 @@ static struct security_operations lowmem_security_ops = { }; static struct ctl_table_header *lowmem_table_header; -/* flag to keep track of how we were registered */ -static int secondary; static struct attribute *lowmem_attrs[] = { &low_watermark_attr.attr, @@ -360,13 +358,7 @@ static int __init lowmem_init(void) /* register ourselves with the security framework */ if (register_security(&lowmem_security_ops)) { printk(KERN_ERR MY_NAME ": Failure registering with the kernel\n"); - /* try registering with primary module */ - if (mod_reg_security(MY_NAME, &lowmem_security_ops)) { - printk(KERN_ERR ": Failure registering with the primary" - "security module.\n"); - return -EINVAL; - } - secondary = 1; + return -EINVAL; } /* initialize the uids vector */