[PATCH] selinux: fix bug in security_compute_sid

851f8a69 · Venkat Yekkirala <[email protected]> · 2006-07-30 03:03:18 -07:00

Initializes newcontext sooner to allow for its destruction in all cases.

Signed-off-by: Venkat Yekkirala <[email protected]>
Signed-off-by: Stephen Smalley <[email protected]>
Acked-by: James Morris <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 851f8a6906b71f7a19043d4d722dd4ffab7aeafc
Parents: ddccef3b

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
security/selinux/ss/services.c	modified	+2	−2	View file

security/selinux/ss/services.c

View file

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index d2e80e6..85e4298 100644
--- a/security/selinux/ss/services.c
+++ b/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: