Commit c80901f2 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

LSM: Add __init to fixup function. 



register_security() became __init function.
So do verify() and security_fixup_ops().

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 7762fbff

security/capability.c

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ static void cap_audit_rule_free(void *lsmrule) 
			}						\

	} while (0)



void security_fixup_ops(struct security_operations *ops)

void __init security_fixup_ops(struct security_operations *ops)

{

	set_to_cap_if_null(ops, ptrace_access_check);

	set_to_cap_if_null(ops, ptrace_traceme);

security/security.c

+2 −2
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = 
	CONFIG_DEFAULT_SECURITY;



/* things that live in capability.c */

extern void security_fixup_ops(struct security_operations *ops);

extern void __init security_fixup_ops(struct security_operations *ops);



static struct security_operations *security_ops;

static struct security_operations default_security_ops = {

	.name	= "default",

};



static inline int verify(struct security_operations *ops)

static inline int __init verify(struct security_operations *ops)

{

	/* verify the security_operations structure exists */

	if (!ops)