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

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

TOMOYO: Fix unused kernel config option. 



CONFIG_SECURITY_TOMOYO_MAX_{ACCEPT_ENTRY,AUDIT_LOG} introduced by commit
0e4ae0e0 "TOMOYO: Make several options configurable." were by error not used.

Reported-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 16014d87

security/tomoyo/common.c

+4 −2
Original line number Diff line number Diff line
@@ -502,8 +502,10 @@ static struct tomoyo_profile *tomoyo_assign_profile 
			TOMOYO_CONFIG_WANT_REJECT_LOG;

		memset(ptr->config, TOMOYO_CONFIG_USE_DEFAULT,

		       sizeof(ptr->config));

		ptr->pref[TOMOYO_PREF_MAX_AUDIT_LOG] = 1024;

		ptr->pref[TOMOYO_PREF_MAX_LEARNING_ENTRY] = 2048;

		ptr->pref[TOMOYO_PREF_MAX_AUDIT_LOG] =

			CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG;

		ptr->pref[TOMOYO_PREF_MAX_LEARNING_ENTRY] =

			CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY;

		mb(); /* Avoid out-of-order execution. */

		ns->profile_ptr[profile] = ptr;

		entry = NULL;