aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2012-01-14 20:36:33 -0600
committerLinus Torvalds2012-01-14 20:36:33 -0600
commitc49c41a4134679cecb77362e7f6b59acb6320aa7 (patch)
tree45e690c036ca5846a48c8be67945d1d841b2d96d /security/capability.c
parent892d208bcf79e4e1058707786a7b6d486697cd78 (diff)
parentf423e5ba76e7e4a6fcb4836b4f072d1fdebba8b5 (diff)
downloadam43-linux-kernel-c49c41a4134679cecb77362e7f6b59acb6320aa7.tar.gz
am43-linux-kernel-c49c41a4134679cecb77362e7f6b59acb6320aa7.tar.xz
am43-linux-kernel-c49c41a4134679cecb77362e7f6b59acb6320aa7.zip
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
* 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: capabilities: remove __cap_full_set definition security: remove the security_netlink_recv hook as it is equivalent to capable() ptrace: do not audit capability check when outputing /proc/pid/stat capabilities: remove task_ns_* functions capabitlies: ns_capable can use the cap helpers rather than lsm call capabilities: style only - move capable below ns_capable capabilites: introduce new has_ns_capabilities_noaudit capabilities: call has_ns_capability from has_capability capabilities: remove all _real_ interfaces capabilities: introduce security_capable_noaudit capabilities: reverse arguments to security_capable capabilities: remove the task from capable LSM hook entirely selinux: sparse fix: fix several warnings in the security server cod selinux: sparse fix: fix warnings in netlink code selinux: sparse fix: eliminate warnings for selinuxfs selinux: sparse fix: declare selinux_disable() in security.h selinux: sparse fix: move selinux_complete_init selinux: sparse fix: make selinux_secmark_refcount static SELinux: Fix RCU deref check warning in sel_netport_insert() Manually fix up a semantic mis-merge wrt security_netlink_recv(): - the interface was removed in commit fd7784615248 ("security: remove the security_netlink_recv hook as it is equivalent to capable()") - a new user of it appeared in commit a38f7907b926 ("crypto: Add userspace configuration API") causing no automatic merge conflict, but Eric Paris pointed out the issue.
Diffstat (limited to 'security/capability.c')
-rw-r--r--security/capability.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c
index 3b5883b7179..2f680eb02b5 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -998,7 +998,6 @@ void __init security_fixup_ops(struct security_operations *ops)
998 set_to_cap_if_null(ops, sem_semctl); 998 set_to_cap_if_null(ops, sem_semctl);
999 set_to_cap_if_null(ops, sem_semop); 999 set_to_cap_if_null(ops, sem_semop);
1000 set_to_cap_if_null(ops, netlink_send); 1000 set_to_cap_if_null(ops, netlink_send);
1001 set_to_cap_if_null(ops, netlink_recv);
1002 set_to_cap_if_null(ops, d_instantiate); 1001 set_to_cap_if_null(ops, d_instantiate);
1003 set_to_cap_if_null(ops, getprocattr); 1002 set_to_cap_if_null(ops, getprocattr);
1004 set_to_cap_if_null(ops, setprocattr); 1003 set_to_cap_if_null(ops, setprocattr);