Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 505f14f7 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by James Morris
Browse files

tomoyo: use DEFINE_SRCU() to define tomoyo_ss 



DEFINE_STATIC_SRCU() defines srcu struct and do init at build time.

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 2c4cdf59

security/tomoyo/tomoyo.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -536,7 +536,7 @@ static struct security_operations tomoyo_security_ops = { 
};

};





/* Lock for GC. */

/* Lock for GC. */

struct srcu_struct tomoyo_ss;

DEFINE_SRCU(tomoyo_ss);





/**

/**

 * tomoyo_init - Register TOMOYO Linux as a LSM module.

 * tomoyo_init - Register TOMOYO Linux as a LSM module.
@@ -550,8 +550,7 @@ static int __init tomoyo_init(void) 
	if (!security_module_enable(&tomoyo_security_ops))

	if (!security_module_enable(&tomoyo_security_ops))

		return 0;

		return 0;

	/* register ourselves with the security framework */

	/* register ourselves with the security framework */

	if (register_security(&tomoyo_security_ops) ||

	if (register_security(&tomoyo_security_ops))

	    init_srcu_struct(&tomoyo_ss))

		panic("Failure registering TOMOYO Linux");

		panic("Failure registering TOMOYO Linux");

	printk(KERN_INFO "TOMOYO Linux initialized\n");

	printk(KERN_INFO "TOMOYO Linux initialized\n");

	cred->security = &tomoyo_kernel_domain;

	cred->security = &tomoyo_kernel_domain;