diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 02:51:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 02:51:27 +0200 |
| commit | 7de8e5737df31a6826015a65135ed8f0a32bb2c4 (patch) | |
| tree | b2d2f1bfc200c3209cecd2be1d3039179b1b14a0 | |
| parent | ARM: mx51_efika: fix build error due to new mfd changes (diff) | |
| parent | selinux: Fix regression for Xorg (diff) | |
| download | linux-7de8e5737df31a6826015a65135ed8f0a32bb2c4.tar.xz linux-7de8e5737df31a6826015a65135ed8f0a32bb2c4.zip | |
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) return i; } - return pol_value; + return SECCLASS_NULL; } static void map_decision(u16 tclass, struct av_decision *avd, |