diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2011-03-25 10:13:43 -0400 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2011-04-07 12:00:12 -0400 |
| commit | eba71de2cb7c02c5ae4f2ad3656343da71bc4661 (patch) | |
| tree | 3eb37c447b2023c86d2c2cadc7b84656c134b646 | |
| parent | f50a3ec961f90e38c0311411179d5dfee1412192 (diff) | |
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>
| -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 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) | |||
| 213 | return i; | 213 | return i; |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | return pol_value; | 216 | return SECCLASS_NULL; |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | static void map_decision(u16 tclass, struct av_decision *avd, | 219 | static void map_decision(u16 tclass, struct av_decision *avd, |