]> 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)
commit1147f75b3e840ef23f467c66998b0b892e08e615
tree7ecaa578bee0dd90fc22daa0e3a736411f2d4309
parentbb446904fbb6336413e019e9e29051b4e6be4be1
parent9640cfd39b927d189b3175e064e93ddf0d1513b1
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 a5c461082f1c
("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