From 866f3d471988eb7e5b08b52432e1ba5432b18f65 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Tue, 27 Sep 2011 11:48:53 +0900
Subject: [PATCH] --- yaml --- r: 264557 b: refs/heads/master c:
 e00fb3f7af111d1b3252f7d622213d2e22be65f5 h: refs/heads/master i:   264555:
 8695f4eec473400340fccf288c592c38dab92394 v: v3

---
 [refs]                         | 2 +-
 trunk/security/tomoyo/domain.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8df9b925f41e..1bb8414e5fba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6cb56fc94f4efaec2d4ad74bed2be7883179ccd
+refs/heads/master: e00fb3f7af111d1b3252f7d622213d2e22be65f5
diff --git a/trunk/security/tomoyo/domain.c b/trunk/security/tomoyo/domain.c
index da16dfeed728..9027ac1534af 100644
--- a/trunk/security/tomoyo/domain.c
+++ b/trunk/security/tomoyo/domain.c
@@ -515,7 +515,8 @@ struct tomoyo_domain_info *tomoyo_assign_domain(const char *domainname,
 			 * that domain. Do not perform domain transition if
 			 * profile for that domain is not yet created.
 			 */
-			if (!entry->ns->profile_ptr[entry->profile])
+			if (tomoyo_policy_loaded &&
+			    !entry->ns->profile_ptr[entry->profile])
 				return NULL;
 		}
 		return entry;