diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-18 20:42:44 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-18 20:42:44 (GMT) |
| commit | e2f3b78557ff11f58d836e016900c3210f4fb1c1 (patch) | |
| tree | 7ecaa578bee0dd90fc22daa0e3a736411f2d4309 /kernel | |
| parent | 6f7024285864290259d6b4c36f9e84a4b89ec3c4 (diff) | |
| parent | 3d2195c3324b27e65ba53d9626a6bd91a2515797 (diff) | |
| download | linux-fsl-qoriq-e2f3b78557ff11f58d836e016900c3210f4fb1c1.tar.xz | |
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 d9914cf66181
("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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions