io_uring/kbuf: always use READ_ONCE() to read ring provided buffer lengths
Jens Axboe
maintainerPATCH 1/1 io_uring/kbuf: always use READ_ONCE() to read ring provided buffer lengths
Since the buffers are mapped from userspace, it is prudent to use READ_ONCE() to read the value into a local variable, and use that for any other actions taken. Having a stable read of the buffer length avoids worrying about it changing after checking, or being read multiple times.
Similarly, the buffer may well change in between it being picked and being committed. Ensure the looping for incremental ring buffer commit stops if it hits a zero sized buffer, as no further progress can be made at that point.
Fixes ae98dbf43d75 ("io_uring/kbuf: add support for incremental buffer consumption")
Reported-by Qingyue Zhang <[email protected]>
Signed-off-by Jens Axboe <[email protected]>
---
io_uring/kbuf.c +13 -7
@@ -36,15 +36,19 @@ static bool io_kbuf_inc_commit(struct io_buffer_list *bl, int len) {while (len) {struct io_uring_buf *buf; -u32 this_len; +u32 buf_len, this_len; buf =io_ring_head_to_buf (bl->buf_ring, bl->head, bl->mask); - this_len =min_t (u32, len, buf->len); - buf->len -= this_len; -if (buf->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->len = buf_len;return false; } + buf->len =0 ; bl->head++; len -= this_len; }
@@ -159,6 +163,7 @@ static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len,__u16 tail, head = bl->head;struct io_uring_buf *buf;void __user *ret; +u32 buf_len; tail =smp_load_acquire (&br->tail);if (unlikely (tail == head))
@@ -168,8 +173,9 @@ static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len, req->flags |=REQ_F_BL_EMPTY ; buf =io_ring_head_to_buf (br, head, bl->mask); -if (*len ==0 || *len > buf->len) - *len = buf->len; + 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_list = bl; req->buf_index = buf->bid;
@@ -265,7 +271,7 @@ static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg, req->buf_index = buf->bid; do { - u32 len = buf->len; + u32 len = READ_ONCE(buf->len); /* truncate end piece, if needed, for non partial buffers */ if (len > arg->max_len) {
Signature · 1 line
Jens Axboe