From bf4c19477542da34dc1b3684bc6a75484fbb5e31 Mon Sep 17 00:00:00 2001
From: Venkat Yekkirala <vyekkirala@trustedcs.com>
Date: Sun, 30 Jul 2006 03:03:18 -0700
Subject: [PATCH] --- yaml --- r: 32921 b: refs/heads/master c:
 851f8a6906b71f7a19043d4d722dd4ffab7aeafc h: refs/heads/master i:   32919:
 b5ce645aba5b929d1db5f79e3a38463bb465feb5 v: v3

---
 [refs]                               | 2 +-
 trunk/security/selinux/ss/services.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 59b11a7e7a9f..13db4828d195 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddccef3b5ec906ff181171e8ffad4fcb996792fd
+refs/heads/master: 851f8a6906b71f7a19043d4d722dd4ffab7aeafc
diff --git a/trunk/security/selinux/ss/services.c b/trunk/security/selinux/ss/services.c
index d2e80e62ff0c..85e429884393 100644
--- a/trunk/security/selinux/ss/services.c
+++ b/trunk/security/selinux/ss/services.c
@@ -833,6 +833,8 @@ static int security_compute_sid(u32 ssid,
 		goto out;
 	}
 
+	context_init(&newcontext);
+
 	POLICY_RDLOCK;
 
 	scontext = sidtab_search(&sidtab, ssid);
@@ -850,8 +852,6 @@ static int security_compute_sid(u32 ssid,
 		goto out_unlock;
 	}
 
-	context_init(&newcontext);
-
 	/* Set the user identity. */
 	switch (specified) {
 	case AVTAB_TRANSITION: