diff options
| author | Eric Paris <eparis@redhat.com> | 2012-07-06 20:13:29 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-07-16 03:40:31 +0200 |
| commit | 64919e60915c5151b3dd4c8d2d9237a115ca990c (patch) | |
| tree | 712cbc272e15a3b3fe70f27a1ac1d7c57bf2300c /security | |
| parent | Merge tag 'fbdev-fixes-for-3.5-2' of git://github.com/schandinat/linux-2.6 (diff) | |
| download | linux-64919e60915c5151b3dd4c8d2d9237a115ca990c.tar.xz linux-64919e60915c5151b3dd4c8d2d9237a115ca990c.zip | |
SELinux: include definition of new capabilities
The kernel has added CAP_WAKE_ALARM and CAP_EPOLLWAKEUP. We need to
define these in SELinux so they can be mediated by policy.
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/include/classmap.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index b8c53723e09b..0b04fd9e9e3e 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -145,7 +145,9 @@ struct security_class_mapping secclass_map[] = { "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", + NULL } }, { "kernel_service", { "use_as_override", "create_files_as", NULL } }, { "tun_socket", { COMMON_SOCK_PERMS, NULL } }, |