Commit bbd64b56 authored by Jens Axboe's avatar Jens Axboe Committed by Jialin Zhang
Browse files

net: provide __sys_shutdown_sock() that takes a socket 

stable inclusion
from stable-v5.10.162
commit 069ac28d92432dd7cdac0a2c141a1b3b8d4330d5
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6BTWC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.167&id=069ac28d92432dd7cdac0a2c141a1b3b8d4330d5



--------------------------------

[ Upstream commit b713c195 ]

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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent beaa0ca3

include/linux/socket.h

+1 −0
Original line number Diff line number Diff line
@@ -436,5 +436,6 @@ 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);

#endif /* _LINUX_SOCKET_H */

net/socket.c

+12 −3
Original line number Diff line number Diff line
@@ -2183,6 +2183,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;
@@ -2190,9 +2201,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;