diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/capability.c | 5 | ||||
-rw-r--r-- | security/security.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/security/capability.c b/security/capability.c index c545bd1300b5..21b6cead6a8e 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -620,10 +620,6 @@ static int cap_socket_accept(struct socket *sock, struct socket *newsock) | |||
620 | return 0; | 620 | return 0; |
621 | } | 621 | } |
622 | 622 | ||
623 | static void cap_socket_post_accept(struct socket *sock, struct socket *newsock) | ||
624 | { | ||
625 | } | ||
626 | |||
627 | static int cap_socket_sendmsg(struct socket *sock, struct msghdr *msg, int size) | 623 | static int cap_socket_sendmsg(struct socket *sock, struct msghdr *msg, int size) |
628 | { | 624 | { |
629 | return 0; | 625 | return 0; |
@@ -1014,7 +1010,6 @@ void security_fixup_ops(struct security_operations *ops) | |||
1014 | set_to_cap_if_null(ops, socket_connect); | 1010 | set_to_cap_if_null(ops, socket_connect); |
1015 | set_to_cap_if_null(ops, socket_listen); | 1011 | set_to_cap_if_null(ops, socket_listen); |
1016 | set_to_cap_if_null(ops, socket_accept); | 1012 | set_to_cap_if_null(ops, socket_accept); |
1017 | set_to_cap_if_null(ops, socket_post_accept); | ||
1018 | set_to_cap_if_null(ops, socket_sendmsg); | 1013 | set_to_cap_if_null(ops, socket_sendmsg); |
1019 | set_to_cap_if_null(ops, socket_recvmsg); | 1014 | set_to_cap_if_null(ops, socket_recvmsg); |
1020 | set_to_cap_if_null(ops, socket_getsockname); | 1015 | set_to_cap_if_null(ops, socket_getsockname); |
diff --git a/security/security.c b/security/security.c index c3586c0d97e2..206e53844d2f 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -1007,11 +1007,6 @@ int security_socket_accept(struct socket *sock, struct socket *newsock) | |||
1007 | return security_ops->socket_accept(sock, newsock); | 1007 | return security_ops->socket_accept(sock, newsock); |
1008 | } | 1008 | } |
1009 | 1009 | ||
1010 | void security_socket_post_accept(struct socket *sock, struct socket *newsock) | ||
1011 | { | ||
1012 | security_ops->socket_post_accept(sock, newsock); | ||
1013 | } | ||
1014 | |||
1015 | int security_socket_sendmsg(struct socket *sock, struct msghdr *msg, int size) | 1010 | int security_socket_sendmsg(struct socket *sock, struct msghdr *msg, int size) |
1016 | { | 1011 | { |
1017 | return security_ops->socket_sendmsg(sock, msg, size); | 1012 | return security_ops->socket_sendmsg(sock, msg, size); |