io_uring/kbuf: use READ_ONCE() for userspace-mapped memory
PATCH 1/1 io_uring/kbuf: use READ_ONCE() for userspace-mapped memory
The struct io_uring_buf elements in a buffer ring are in a memory region accessible from userspace. A malicious/buggy userspace program could therefore write to them at any time, so they should be accessed with READ_ONCE() in the kernel. Commit 98b6fa62c84f ("io_uring/kbuf: always use READ_ONCE() to read ring provided buffer lengths") already switched the reads of the len field to READ_ONCE(). Do the same for bid and addr.
--- io_uring/kbuf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
io_uring/kbuf.c +5 -5
@@ -42,11 +42,11 @@ static bool io_kbuf_inc_commit(struct io_buffer_list *bl, int len) buf_len =READ_ONCE (buf->len); this_len =min_t (u32, len, buf_len); buf_len -= this_len;/* Stop looping for invalid buffer length of 0 */ if (buf_len || !this_len) { - buf->addr += this_len; + buf->addr =READ_ONCE (buf->addr) + this_len; buf->len = buf_len;return false; } buf->len =0 ; bl->head++;
@@ -196,13 +196,13 @@ static struct io_br_sel io_ring_buffer_select(struct io_kiocb *req, size_t *len, buf =io_ring_head_to_buf (br, head, bl->mask); buf_len =READ_ONCE (buf->len);if (*len ==0 || *len > buf_len) *len = buf_len; req->flags |=REQ_F_BUFFER_RING |REQ_F_BUFFERS_COMMIT ; - req->buf_index = buf->bid; + req->buf_index =READ_ONCE (buf->bid); sel.buf_list = bl; - sel.addr =u64_to_user_ptr (buf->addr); + sel.addr =u64_to_user_ptr (READ_ONCE (buf->addr));if (io_should_commit (req, issue_flags)) {io_kbuf_commit (req, sel.buf_list, *len,1 ); sel.buf_list =NULL ; }
@@ -278,11 +278,11 @@ static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg,/* set it to max, if not set, so we can use it unconditionally */ if (!arg->max_len) arg->max_len =INT_MAX ; - req->buf_index = buf->bid; + req->buf_index =READ_ONCE (buf->bid); do { u32 len = READ_ONCE(buf->len); /* truncate end piece, if needed, for non partial buffers */ if (len > arg->max_len) {
@@ -293,11 +293,11 @@ static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg,break ; buf->len = len; } } - iov->iov_base =u64_to_user_ptr (buf->addr); + iov->iov_base =u64_to_user_ptr (READ_ONCE (buf->addr)); iov->iov_len = len; iov++; arg->out_len += len; arg->max_len -= len;
Signature · 1 line
2.45.2
Quoted 8 lines · Caleb Sander Mateos
The struct
io_uring_bufelements in a buffer ring are in a memory region accessible from userspace. A malicious/buggy userspace program could therefore write to them at any time, so they should be accessed withREAD_ONCE()in the kernel. Commit98b6fa62c84f("io_uring/kbuf: always useREAD_ONCE()to read ring provided buffer lengths") already switched the reads of the len field toREAD_ONCE(). Do the same for bid and addr.[...]
Applied, thanks!
[1/1] io_uring/kbuf: use READ_ONCE() for userspace-mapped memory
commit: 78385c7299f7514697d196b3233a91bd5e485591
Best regards,
Signature · 1 line
Jens Axboe