Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

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

diff --cc security/selinux/include/classmap.h
index b8c53723e09bfe7d6c211bc05df35793ae9ac8b2,0b04fd9e9e3e95bbc6a664be5b80e2b0407f6b3f..df2de54a958debfab56caf3483cd5d93856e5be4
--- 1/security/selinux/include/classmap.h
--- 2/security/selinux/include/classmap.h
+++ b/security/selinux/include/classmap.h
@@@ -145,7 -145,9 +145,9 @@@ struct security_class_mapping secclass_
            "node_bind", "name_connect", NULL } },
        { "memprotect", { "mmap_zero", NULL } },
        { "peer", { "recv", NULL } },
-       { "capability2", { "mac_override", "mac_admin", "syslog", NULL } },
+       { "capability2",
 -        { "mac_override", "mac_admin", "syslog", "wake_alarm", "epollwakeup",
++        { "mac_override", "mac_admin", "syslog", "wake_alarm", "block_suspend",
+           NULL } },
        { "kernel_service", { "use_as_override", "create_files_as", NULL } },
        { "tun_socket",
          { COMMON_SOCK_PERMS, NULL } },