io_uring/kbuf: use pre-committed buffer address for non-pollable file

For non-pollable files, buffer ring consumption will commit upfront.
This is fine, but io_ring_buffer_select() will return the address of the
buffer after having committed it. For incrementally consumed buffers,
this is incorrect as it will modify the buffer address.

Store the pre-committed value and return that. If that isn't done, then
the initial part of the buffer is not used and the application will
correctly assume the content arrived at the start of the userspace
buffer, but the kernel will have put it later in the buffer. Or it can
cause a spurious -EFAULT returned in the CQE, depending on the buffer
size. As bounds are suitably checked for doing the actual IO, no adverse
side effects are possible - it's just a data misplacement within the
existing buffer.

Reported-by: Gwendal Fernet <gwendalfernet@gmail.com>
Cc: stable@vger.kernel.org
Fixes: ae98dbf43d75 ("io_uring/kbuf: add support for incremental buffer consumption")
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
index d407576ddfb7822105f3b47ea3e670a56103e836..eec5eb7de8430ebf806a7bfbdbbfdefb2b176921 100644 (file)
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@ -139,6 +139,7 @@ static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len,
        struct io_uring_buf_ring *br = bl->buf_ring;
        __u16 tail, head = bl->head;
        struct io_uring_buf *buf;
+       void __user *ret;
 
        tail = smp_load_acquire(&br->tail);
        if (unlikely(tail == head))
@@ -153,6 +154,7 @@ static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len,
        req->flags |= REQ_F_BUFFER_RING | REQ_F_BUFFERS_COMMIT;
        req->buf_list = bl;
        req->buf_index = buf->bid;
+       ret = u64_to_user_ptr(buf->addr);
 
        if (issue_flags & IO_URING_F_UNLOCKED || !io_file_can_poll(req)) {
                /*
@@ -168,7 +170,7 @@ static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len,
                io_kbuf_commit(req, bl, *len, 1);
                req->buf_list = NULL;
        }
-       return u64_to_user_ptr(buf->addr);
+       return ret;
 }
 
 void __user *io_buffer_select(struct io_kiocb *req, size_t *len,