Commit 7de8e573 authored Mar 28, 2011 by Linus Torvalds

Merge branch 'for-linus' of...

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

parents b5b4bc32 85cd6da5

security/selinux/ss/services.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,