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>

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 365f3bddee794786268b94010779238ed0afd9a3..96b7233a0df601c26bfcec6c1a58560c91f3a6ca 100644 (file)
--- 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;