aboutsummaryrefslogtreecommitdiffstats
path: root/security/tomoyo
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2011-09-26 22:48:53 -0400
committerJames Morris <jmorris@namei.org>2011-09-27 21:53:15 -0400
commite00fb3f7af111d1b3252f7d622213d2e22be65f5 (patch)
tree387b90728d0a1657e94d530c81e69c9b197f1c1c /security/tomoyo
parentc6cb56fc94f4efaec2d4ad74bed2be7883179ccd (diff)
TOMOYO: Fix domain transition failure warning.
Commit bd03a3e4 "TOMOYO: Add policy namespace support." introduced policy namespace. But as of /sbin/modprobe is executed from initramfs/initrd, profiles for target domain's namespace is not defined because /sbin/tomoyo-init is not yet called. Reported-by: Jamie Nguyen <jamie@tomoyolinux.co.uk> Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/tomoyo')
-rw-r--r--security/tomoyo/domain.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
index da16dfeed728..9027ac1534af 100644
--- a/security/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -515,7 +515,8 @@ struct tomoyo_domain_info *tomoyo_assign_domain(const char *domainname,
515 * that domain. Do not perform domain transition if 515 * that domain. Do not perform domain transition if
516 * profile for that domain is not yet created. 516 * profile for that domain is not yet created.
517 */ 517 */
518 if (!entry->ns->profile_ptr[entry->profile]) 518 if (tomoyo_policy_loaded &&
519 !entry->ns->profile_ptr[entry->profile])
519 return NULL; 520 return NULL;
520 } 521 }
521 return entry; 522 return entry;