aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2011-06-29 00:07:52 -0400
committerJames Morris <jmorris@namei.org>2011-06-30 04:48:37 -0400
commit7986cf28bc5050967a7056d6eadda7f16f84eaab (patch)
tree7330d23c10e04c0c8319f37335e87e9fd0f22b4b
parentda3f1c7b7d34e66cf571a613525ca0d23f92d42f (diff)
TOMOYO: Fix build error with CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=y .
I forgot to add #ifndef in commit 0e4ae0e0 "TOMOYO: Make several options configurable.", resulting security/built-in.o: In function `tomoyo_bprm_set_creds': tomoyo.c:(.text+0x4698e): undefined reference to `tomoyo_load_policy' error. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> 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/tomoyo.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index 2615c7d43960..d6f68a0ec2dc 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -51,12 +51,14 @@ static int tomoyo_bprm_set_creds(struct linux_binprm *bprm)
51 */ 51 */
52 if (bprm->cred_prepared) 52 if (bprm->cred_prepared)
53 return 0; 53 return 0;
54#ifndef CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
54 /* 55 /*
55 * Load policy if /sbin/tomoyo-init exists and /sbin/init is requested 56 * Load policy if /sbin/tomoyo-init exists and /sbin/init is requested
56 * for the first time. 57 * for the first time.
57 */ 58 */
58 if (!tomoyo_policy_loaded) 59 if (!tomoyo_policy_loaded)
59 tomoyo_load_policy(bprm->filename); 60 tomoyo_load_policy(bprm->filename);
61#endif
60 /* 62 /*
61 * Release reference to "struct tomoyo_domain_info" stored inside 63 * Release reference to "struct tomoyo_domain_info" stored inside
62 * "bprm->cred->security". New reference to "struct tomoyo_domain_info" 64 * "bprm->cred->security". New reference to "struct tomoyo_domain_info"