Saner ->async_data handling
Subsystems (2)
Jens Axboe
maintainercover Saner ->async_data handling
Hi,
Just two minor fixes - one for an issue where futex was handling ->async_data setting and clearing inconsistently wrt REQ_F_ASYNC_DATA, and then a followup that just ensures that other opcode handlers can't mess this up.
io_uring/futex.c | 3 +++ io_uring/io_uring.c | 1 + 2 files changed, 4 insertions(+)
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/2 io_uring/futex: ensure io_futex_wait() cleans up properly on failure
The io_futex_data is allocated upfront and assigned to the io_kiocb async_data field, but the request isn't marked with REQ_F_ASYNC_DATA at that point. Those two should always go together, as the flag tells io_uring whether the field is valid or not.
Additionally, on failure cleanup, the futex handler frees the data but does not clear ->async_data. Clear the data and the flag in the error path as well.
Thanks to Trend Micro Zero Day Initiative and particularly ReDress for reporting this.
--- io_uring/futex.c | 3 +++ 1 file changed, 3 insertions(+)
io_uring/futex.c +3 -0
@@ -288,6 +288,7 @@ int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags) goto done_unlock; } + req->flags |=REQ_F_ASYNC_DATA ; req->async_data = ifd; ifd->q = futex_q_init; ifd->q.bitset = iof->futex_mask;
@@ -309,6 +310,8 @@ int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags)if (ret <0 )req_set_fail (req);io_req_set_res (req, ret,0 ); + req->async_data =NULL ; + req->flags &= ~REQ_F_ASYNC_DATA ;kfree (ifd);return IOU_COMPLETE ; }
Signature · 1 line
2.50.1
Jens Axboe
maintainerPATCH 2/2 io_uring: clear ->async_data as part of normal init
In reply to Jens AxboeOpcode handlers like POLL_ADD will use ->async_data as the pointer for double poll handling, which is a bit different than the usual case where it's strictly gated by the REQ_F_ASYNC_DATA flag. Be a bit more proactive in handling ->async_data, and clear it to NULL as part of regular init. Init is touching that cacheline anyway, so might as well clear it.
--- io_uring/io_uring.c | 1 + 1 file changed, 1 insertion(+)
io_uring/io_uring.c +1 -0
@@ -2119,6 +2119,7 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, req->file =NULL ; req->tctx = current->io_uring; req->cancel_seq_set = false; + req->async_data =NULL ;if (unlikely (opcode >=IORING_OP_LAST )) { req->opcode =0 ;
Signature · 1 line
2.50.1