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>
This commit is contained in:
parent
3eb2138d46
commit
ef329fa764
@ -143,15 +143,13 @@ static inline void io_req_set_rsrc_node(struct io_kiocb *req,
|
|||||||
unsigned int issue_flags)
|
unsigned int issue_flags)
|
||||||
{
|
{
|
||||||
if (!req->rsrc_node) {
|
if (!req->rsrc_node) {
|
||||||
|
io_ring_submit_lock(ctx, issue_flags);
|
||||||
|
|
||||||
|
lockdep_assert_held(&ctx->uring_lock);
|
||||||
|
|
||||||
req->rsrc_node = ctx->rsrc_node;
|
req->rsrc_node = ctx->rsrc_node;
|
||||||
|
io_charge_rsrc_node(ctx);
|
||||||
if (!(issue_flags & IO_URING_F_UNLOCKED)) {
|
io_ring_submit_unlock(ctx, issue_flags);
|
||||||
lockdep_assert_held(&ctx->uring_lock);
|
|
||||||
|
|
||||||
io_charge_rsrc_node(ctx);
|
|
||||||
} else {
|
|
||||||
percpu_ref_get(&req->rsrc_node->refs);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user