leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TOMOYO: Fix build error with CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=y .

Browse Source 
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>
This commit is contained in:
Tetsuo Handa 2011-06-29 13:07:52 +09:00 committed by James Morris
parent da3f1c7b7d
commit 7986cf28bc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/tomoyo/tomoyo.c
View File

@ -51,12 +51,14 @@ static int tomoyo_bprm_set_creds(struct linux_binprm *bprm)
*/ */
if (bprm->cred_prepared) if (bprm->cred_prepared)
return 0; return 0;
#ifndef CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
/* /*
* Load policy if /sbin/tomoyo-init exists and /sbin/init is requested * Load policy if /sbin/tomoyo-init exists and /sbin/init is requested
* for the first time. * for the first time.
*/ */
if (!tomoyo_policy_loaded) if (!tomoyo_policy_loaded)
tomoyo_load_policy(bprm->filename); tomoyo_load_policy(bprm->filename);
#endif
/* /*
* Release reference to "struct tomoyo_domain_info" stored inside * Release reference to "struct tomoyo_domain_info" stored inside
* "bprm->cred->security". New reference to "struct tomoyo_domain_info" * "bprm->cred->security". New reference to "struct tomoyo_domain_info"