diff options
| author | Paul Moore <pmoore@redhat.com> | 2014-08-05 15:44:22 -0400 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-08-05 15:44:22 -0400 |
| commit | aa9e0de81b5b257f6dae48efe2ed5f255f066497 (patch) | |
| tree | 9b0b791d5912368006115427e74105cfe26750bd /security/selinux | |
| parent | 4fbe63d1c773cceef3fe1f6ed0c9c268f4f24760 (diff) | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) | |
| download | blackbird-obmc-linux-aa9e0de81b5b257f6dae48efe2ed5f255f066497.tar.gz blackbird-obmc-linux-aa9e0de81b5b257f6dae48efe2ed5f255f066497.zip | |
Merge tag 'v3.16' into next
Linux 3.16
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/hooks.c | 2 | ||||
| -rw-r--r-- | security/selinux/include/classmap.h | 2 |
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 } }, |
