commit 4eb327b517cf85f6cb7dcd5691e7b748cbe8c343
author Venkat Yekkirala <vyekkirala@TrustedCS.com> Tue Sep 19 10:24:19 2006 -0700
committer David S. Miller <davem@sunset.davemloft.net> Fri Sep 22 15:19:04 2006 -0700
tree 51bd92e6b5582a10f21de0d909fb062d6ecf8cce
parent 161643660129dd7d98f0b12418c0a2710ffa7db6

[SELINUX]: Fix bug in security_sid_mls_copy

The following fixes a bug where random mem is being tampered with in the
non-mls case; encountered by Jashua Brindle on a gentoo box.

Signed-off-by: Venkat Yekkirala <vyekkirala@TrustedCS.com>
Acked-by:  Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>

security/selinux/ss/services.c

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 27ee28cc..7eb69a6 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1841,7 +1841,7 @@
 	u32 len;
 	int rc = 0;
 
-	if (!ss_initialized) {
+	if (!ss_initialized || !selinux_mls_enabled) {
 		*new_sid = sid;
 		goto out;
 	}