* [PATCH 5.10 09/63] net: provide __sys_shutdown_sock() that takes a socket
[not found] <20230103081308.548338576@linuxfoundation.org>
@ 2023-01-03 8:13 ` Greg Kroah-Hartman
0 siblings, 0 replies; only message in thread
From: Greg Kroah-Hartman @ 2023-01-03 8:13 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, netdev, David S. Miller,
Jakub Kicinski, Jens Axboe
From: Jens Axboe <axboe@kernel•dk>
[ Upstream commit b713c195d59332277a31a59c91f755e53b5b302b ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
---
include/linux/socket.h | 1 +
net/socket.c | 15 ++++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -436,5 +436,6 @@ extern int __sys_getpeername(int fd, str
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 */
--- a/net/socket.c
+++ b/net/socket.c
@@ -2181,6 +2181,17 @@ SYSCALL_DEFINE5(getsockopt, int, fd, int
* 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;
@@ -2188,9 +2199,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;
^ permalink raw reply [flat|nested] only message in thread