diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2011-03-25 15:13:43 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-29 01:26:30 +0200 |
| commit | 85cd6da53a8073d3f4503f56e4ea6cddccbb1c7f (patch) | |
| tree | 9c71a1426c09767e7470fea2c244c9ebd3ec4d8c /security/selinux/ss | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| download | linux-85cd6da53a8073d3f4503f56e4ea6cddccbb1c7f.tar.xz linux-85cd6da53a8073d3f4503f56e4ea6cddccbb1c7f.zip | |
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>
Diffstat (limited to 'security/selinux/ss')
| -rw-r--r-- | security/selinux/ss/services.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 3e7544d2a07b..ea7c01f4a2bf 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, |