Merge tag 'io_uring-5.8-2020-07-17' of git://git.kernel.dk/linux-block into master (4ebf8d76) · Commits · 戴 / test

Pull io_uring fix from Jens Axboe: "Fix for a case where, with automatic buffer selection, we can leak the buffer descriptor for recvmsg" * tag 'io_uring-5.8-2020-07-17' of git://git.kernel.dk/linux-block: io_uring: fix recvmsg memory leak with buffer selection

fs/io_uring.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -3845,10 +3845,16 @@ static int io_recvmsg(struct io_kiocb *req, bool force_nonblock)

		ret = __sys_recvmsg_sock(sock, &kmsg->msg, req->sr_msg.msg,
		kmsg->uaddr, flags);
		if (force_nonblock && ret == -EAGAIN)
		return io_setup_async_msg(req, kmsg);
		if (force_nonblock && ret == -EAGAIN) {
		ret = io_setup_async_msg(req, kmsg);
		if (ret != -EAGAIN)
		kfree(kbuf);
		return ret;
		}
		if (ret == -ERESTARTSYS)
		ret = -EINTR;
		if (kbuf)
		kfree(kbuf);
		}

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

Admin message