summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-28 17:51:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-28 17:51:27 -0700
commit7de8e5737df31a6826015a65135ed8f0a32bb2c4 (patch)
treeb2d2f1bfc200c3209cecd2be1d3039179b1b14a0
parentb5b4bc32b68d711f8b79a1d60e35892d761417c7 (diff)
parent85cd6da53a8073d3f4503f56e4ea6cddccbb1c7f (diff)
downloadblackbird-op-linux-7de8e5737df31a6826015a65135ed8f0a32bb2c4.tar.gz
blackbird-op-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.c2
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,
OpenPOWER on IntegriCloud