selinux: Fix regression for Xorg
authorStephen Smalley <sds@tycho.nsa.gov>
Fri, 25 Mar 2011 14:13:43 +0000 (10:13 -0400)
committerJames Morris <jmorris@namei.org>
Mon, 28 Mar 2011 23:26:30 +0000 (10:26 +1100)
Commit 6f5317e730505d5cbc851c435a2dfe3d5a21d343 introduced a bug in the
handling of userspace object classes that is causing breakage for Xorg
when XSELinux is enabled.  Fix the bug by changing map_class() to return
SECCLASS_NULL when the class cannot be mapped to a kernel object class.

Reported-by: "Justin P. Mattock" <justinmattock@gmail.com>
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
security/selinux/ss/services.c

index 3e7544d2a07bb617e4d7a4eaee6cf6dcb0dd6c63..ea7c01f4a2bf8388f27beda3e8c33d25baf7914f 100644 (file)
@@ -213,7 +213,7 @@ static u16 map_class(u16 pol_value)
                        return i;
        }
 
-       return pol_value;
+       return SECCLASS_NULL;
 }
 
 static void map_decision(u16 tclass, struct av_decision *avd,