diff options
| author | Pavel Begunkov | 2023-03-29 15:03:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2023-04-06 12:10:51 +0200 |
| commit | ef329fa764c3c27f43db0f7c57adbe84e9a07f00 (patch) | |
| tree | f6e9a10113d4187aecc9b46bbabc8b26f01e9fbc | |
| parent | 3eb2138d4693d81aa6e5514f439be255117cae63 (diff) | |
io_uring/rsrc: fix rogue rsrc node grabbing
commit 4ff0b50de8cabba055efe50bbcb7506c41a69835 upstream.
We should not be looking at ctx->rsrc_node and anyhow modifying the node
without holding uring_lock, grabbing references in such a way is not
safe either.
Cc: stable@vger.kernel.org
Fixes: 5106dd6e74ab6 ("io_uring: propagate issue_flags state down to file assignment")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/1202ede2d7bb90136e3482b2b84aad9ed483e5d6.1680098433.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | io_uring/rsrc.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index 81445a477622..d60c758326b4 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -143,15 +143,13 @@ static inline void io_req_set_rsrc_node(struct io_kiocb *req, unsigned int issue_flags) { if (!req->rsrc_node) { - req->rsrc_node = ctx->rsrc_node; + io_ring_submit_lock(ctx, issue_flags); - if (!(issue_flags & IO_URING_F_UNLOCKED)) { - lockdep_assert_held(&ctx->uring_lock); + lockdep_assert_held(&ctx->uring_lock); - io_charge_rsrc_node(ctx); - } else { - percpu_ref_get(&req->rsrc_node->refs); - } + req->rsrc_node = ctx->rsrc_node; + io_charge_rsrc_node(ctx); + io_ring_submit_unlock(ctx, issue_flags); } } |