]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jul 2012 20:42:44 +0000 (13:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jul 2012 20:42:44 +0000 (13:42 -0700)
commit66d78c172d8cf2f564adc9c9fffa537332911057
tree7ecaa578bee0dd90fc22daa0e3a736411f2d4309
parentc4e0f3880b189ffccf1c877fad60d2c42c31d715
parent9b978e5a00beacc8ab805706dc589ccd16afdd38
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull SELinux regression fixes from James Morris.

Andrew Morton has a box that hit that open perms problem.

I also renamed the "epollwakeup" selinux name for the new capability to
be "block_suspend", to match the rename done by commit 6546ff62e8d0
("PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND").

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  SELinux: do not check open perms if they are not known to policy
  SELinux: include definition of new capabilities
security/selinux/include/classmap.h