From: Stephen Smalley <sds@tycho.nsa.gov>
Date: Fri, 25 Mar 2011 14:13:43 +0000 (-0400)
Subject: selinux: Fix regression for Xorg
X-Git-Tag: Ubuntu-5.0.0-8.9~18928^2^2~21
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=eba71de2cb7c02c5ae4f2ad3656343da71bc4661;p=mirror_ubuntu-disco-kernel.git

selinux: Fix regression for Xorg

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>
---

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 39d732145abe..f3f5dca81006 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -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,