net: provide __sys_shutdown_sock() that takes a socket

No functional changes in this patch, needed to provide io_uring support
for shutdown(2).

Cc: netdev@vger.kernel.org
Cc: David S. Miller <davem@davemloft.net>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/include/linux/socket.h b/include/linux/socket.h
index e9cb30d8cbfb1979a3dc16cd61f565bdfd4ddbb7..385894b4a8bbac2ce48f57224b04c692474d7d68 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -436,6 +436,7 @@ extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr,
                             int __user *usockaddr_len);
 extern int __sys_socketpair(int family, int type, int protocol,
                            int __user *usockvec);
+extern int __sys_shutdown_sock(struct socket *sock, int how);
 extern int __sys_shutdown(int fd, int how);
 
 extern struct ns_common *get_net_ns(struct ns_common *ns);

diff --git a/net/socket.c b/net/socket.c
index 6e6cccc2104f70093aaf92e13fb23400254d1bc2..4b615c7197655c8019f5672f995d2615bdd434fe 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2192,6 +2192,17 @@ SYSCALL_DEFINE5(getsockopt, int, fd, int, level, int, optname,
  *     Shutdown a socket.
  */
 
+int __sys_shutdown_sock(struct socket *sock, int how)
+{
+       int err;
+
+       err = security_socket_shutdown(sock, how);
+       if (!err)
+               err = sock->ops->shutdown(sock, how);
+
+       return err;
+}
+
 int __sys_shutdown(int fd, int how)
 {
        int err, fput_needed;
@@ -2199,9 +2210,7 @@ int __sys_shutdown(int fd, int how)
 
        sock = sockfd_lookup_light(fd, &err, &fput_needed);
        if (sock != NULL) {
-               err = security_socket_shutdown(sock, how);
-               if (!err)
-                       err = sock->ops->shutdown(sock, how);
+               err = __sys_shutdown_sock(sock, how);
                fput_light(sock->file, fput_needed);
        }
        return err;