Commit 6b754c8b authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: remove extra checks in send/recv 



With the return on a bad socket, kmsg is always non-null by the end
of the function, prune left extra checks and initialisations.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7a7cacba

fs/io_uring.c

+5 −5
Original line number Diff line number Diff line
@@ -3916,7 +3916,7 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
static int io_sendmsg(struct io_kiocb *req, bool force_nonblock,

		      struct io_comp_state *cs)

{

	struct io_async_msghdr iomsg, *kmsg = NULL;

	struct io_async_msghdr iomsg, *kmsg;

	struct socket *sock;

	unsigned flags;

	int ret;
@@ -3951,7 +3951,7 @@ static int io_sendmsg(struct io_kiocb *req, bool force_nonblock, 
	if (ret == -ERESTARTSYS)

		ret = -EINTR;



	if (kmsg && kmsg->iov != kmsg->fast_iov)

	if (kmsg->iov != kmsg->fast_iov)

		kfree(kmsg->iov);

	req->flags &= ~REQ_F_NEED_CLEANUP;

	if (ret < 0)
@@ -4147,7 +4147,7 @@ static int io_recvmsg_prep(struct io_kiocb *req, 
static int io_recvmsg(struct io_kiocb *req, bool force_nonblock,

		      struct io_comp_state *cs)

{

	struct io_async_msghdr iomsg, *kmsg = NULL;

	struct io_async_msghdr iomsg, *kmsg;

	struct socket *sock;

	struct io_buffer *kbuf;

	unsigned flags;
@@ -4199,7 +4199,7 @@ static int io_recvmsg(struct io_kiocb *req, bool force_nonblock, 
	if (kbuf)

		kfree(kbuf);



	if (kmsg && kmsg->iov != kmsg->fast_iov)

	if (kmsg->iov != kmsg->fast_iov)

		kfree(kmsg->iov);

	req->flags &= ~REQ_F_NEED_CLEANUP;
@@ -4212,7 +4212,7 @@ static int io_recvmsg(struct io_kiocb *req, bool force_nonblock, 
static int io_recv(struct io_kiocb *req, bool force_nonblock,

		   struct io_comp_state *cs)

{

	struct io_buffer *kbuf = NULL;

	struct io_buffer *kbuf;

	struct io_sr_msg *sr = &req->sr_msg;

	struct msghdr msg;

	void __user *buf = sr->buf;