Commit 4af3417a authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: refactor compat_msghdr import 



Add an entry for user pointer to compat_msghdr into io_connect, so it's
explicit that we may use it as this, and removes annoying casts.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/73fd644dea1518f528d3648981cf777ce6e537e9.1618101759.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0bdf3398

fs/io_uring.c

+5 −6
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ struct io_connect { 
struct io_sr_msg {

	struct file			*file;

	union {

		struct compat_msghdr __user	*umsg_compat;

		struct user_msghdr __user	*umsg;

		void __user			*buf;

	};
@@ -4435,15 +4436,13 @@ static int __io_recvmsg_copy_hdr(struct io_kiocb *req, 
static int __io_compat_recvmsg_copy_hdr(struct io_kiocb *req,

					struct io_async_msghdr *iomsg)

{

	struct compat_msghdr __user *msg_compat;

	struct io_sr_msg *sr = &req->sr_msg;

	struct compat_iovec __user *uiov;

	compat_uptr_t ptr;

	compat_size_t len;

	int ret;



	msg_compat = (struct compat_msghdr __user *) sr->umsg;

	ret = __get_compat_msghdr(&iomsg->msg, msg_compat, &iomsg->uaddr,

	ret = __get_compat_msghdr(&iomsg->msg, sr->umsg_compat, &iomsg->uaddr,

				  &ptr, &len);

	if (ret)

		return ret;