summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDylan Yudaken <dylany@fb.com>2022-07-14 14:02:56 +0300
committerJens Axboe <axboe@kernel.dk>2022-07-25 03:39:17 +0300
commit7fa875b8e53c288d616234b9daf417b0650ce1cc (patch)
tree90e39aaad21bdbfe46b354283a988039c5c15c0e /include
parent6d2f75a0cf3048ef38c48493f66a923353bf664b (diff)
downloadlinux-7fa875b8e53c288d616234b9daf417b0650ce1cc.tar.xz
net: copy from user before calling __copy_msghdr
this is in preparation for multishot receive from io_uring, where it needs to have access to the original struct user_msghdr. functionally this should be a no-op. Acked-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Dylan Yudaken <dylany@fb.com> Link: https://lore.kernel.org/r/20220714110258.1336200-2-dylany@fb.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include')
-rw-r--r--include/linux/socket.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 17311ad9f9af..be24f1c8568a 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -416,10 +416,9 @@ extern int recvmsg_copy_msghdr(struct msghdr *msg,
struct user_msghdr __user *umsg, unsigned flags,
struct sockaddr __user **uaddr,
struct iovec **iov);
-extern int __copy_msghdr_from_user(struct msghdr *kmsg,
- struct user_msghdr __user *umsg,
- struct sockaddr __user **save_addr,
- struct iovec __user **uiov, size_t *nsegs);
+extern int __copy_msghdr(struct msghdr *kmsg,
+ struct user_msghdr *umsg,
+ struct sockaddr __user **save_addr);
/* helpers which do the actual work for syscalls */
extern int __sys_recvfrom(int fd, void __user *ubuf, size_t size,