diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /security/selinux | |
parent | 67da22d23fa6f3324e03bcd0580b914b2e4afbf3 (diff) | |
parent | 3e4b9459fb0e149c6b74c9e89399a8fc39a92b44 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Diffstat (limited to 'security/selinux')
-rw-r--r-- | security/selinux/hooks.c | 2 | ||||
-rw-r--r-- | security/selinux/include/classmap.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 4ee6f2370016..13ae6b0bdd65 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2717,7 +2717,7 @@ static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr) | |||
2717 | ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_TIMES_SET)) | 2717 | ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_TIMES_SET)) |
2718 | return dentry_has_perm(cred, dentry, FILE__SETATTR); | 2718 | return dentry_has_perm(cred, dentry, FILE__SETATTR); |
2719 | 2719 | ||
2720 | if (ia_valid & ATTR_SIZE) | 2720 | if (selinux_policycap_openperm && (ia_valid & ATTR_SIZE)) |
2721 | av |= FILE__OPEN; | 2721 | av |= FILE__OPEN; |
2722 | 2722 | ||
2723 | return dentry_has_perm(cred, dentry, av); | 2723 | return dentry_has_perm(cred, dentry, av); |
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index b8c53723e09b..df2de54a958d 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h | |||
@@ -145,7 +145,9 @@ struct security_class_mapping secclass_map[] = { | |||
145 | "node_bind", "name_connect", NULL } }, | 145 | "node_bind", "name_connect", NULL } }, |
146 | { "memprotect", { "mmap_zero", NULL } }, | 146 | { "memprotect", { "mmap_zero", NULL } }, |
147 | { "peer", { "recv", NULL } }, | 147 | { "peer", { "recv", NULL } }, |
148 | { "capability2", { "mac_override", "mac_admin", "syslog", NULL } }, | 148 | { "capability2", |
149 | { "mac_override", "mac_admin", "syslog", "wake_alarm", "block_suspend", | ||
150 | NULL } }, | ||
149 | { "kernel_service", { "use_as_override", "create_files_as", NULL } }, | 151 | { "kernel_service", { "use_as_override", "create_files_as", NULL } }, |
150 | { "tun_socket", | 152 | { "tun_socket", |
151 | { COMMON_SOCK_PERMS, NULL } }, | 153 | { COMMON_SOCK_PERMS, NULL } }, |