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
This commit is contained in:
Linus Torvalds 2011-03-28 17:51:27 -07:00
commit 7de8e5737d

View File

@ -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,