diff options
| author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2011-10-16 09:43:46 +0900 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-10-19 16:58:59 +0200 |
| commit | 6afcb3b7393f5aa388a0d077c490ed411ab3cd27 (patch) | |
| tree | f2d0bca0df7ee7322dee3cfa914e8bb4febf434b | |
| parent | 16014d87509e26d6ed6935adbbf437a571fb5870 (diff) | |
| download | kernel-common-6afcb3b7393f5aa388a0d077c490ed411ab3cd27.tar.gz kernel-common-6afcb3b7393f5aa388a0d077c490ed411ab3cd27.tar.bz2 kernel-common-6afcb3b7393f5aa388a0d077c490ed411ab3cd27.zip | |
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: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | security/tomoyo/common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c index 365f3bddee79..96b7233a0df6 100644 --- a/security/tomoyo/common.c +++ b/security/tomoyo/common.c @@ -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; |