Merge tag 'v3.16' into next

Linux 3.16

2 files changed, 2 insertions, 2 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 39bc8c94b969..b0e940497e23 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5736,7 +5736,7 @@ static void selinux_key_free(struct key *k)
 
 static int selinux_key_permission(key_ref_t key_ref,
                                   const struct cred *cred,
-                                  key_perm_t perm)
+                                  unsigned perm)
 {
         struct key *key;
         struct key_security_struct *ksec;
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h
index 14d04e63b1f0..be491a74c1ed 100644
--- a/security/selinux/include/classmap.h
+++ b/security/selinux/include/classmap.h
@@ -147,7 +147,7 @@ struct security_class_mapping secclass_map[] = {
         { "peer", { "recv", NULL } },
         { "capability2",
           { "mac_override", "mac_admin", "syslog", "wake_alarm", "block_suspend",
-            NULL } },
+            "audit_read", NULL } },
         { "kernel_service", { "use_as_override", "create_files_as", NULL } },
         { "tun_socket",
           { COMMON_SOCK_PERMS, "attach_queue", NULL } },