diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 20:51:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 20:51:27 -0400 |
| commit | 7de8e5737df31a6826015a65135ed8f0a32bb2c4 (patch) | |
| tree | b2d2f1bfc200c3209cecd2be1d3039179b1b14a0 | |
| parent | b5b4bc32b68d711f8b79a1d60e35892d761417c7 (diff) | |
| parent | 85cd6da53a8073d3f4503f56e4ea6cddccbb1c7f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
selinux: Fix regression for Xorg
| -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) | |||
| 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, |