Commit b50f472e authored by Pavel Begunkov's avatar Pavel Begunkov Committed by ZhangPeng
Browse files

io_uring: fix io_match_task must_hold 

stable inclusion
from stable-v6.6.44
commit 766b0e807e1d5caeeb1f19344d2e8d3c41e5a3ef
bugzilla: https://gitee.com/openeuler/kernel/issues/IAHMJO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=766b0e807e1d5caeeb1f19344d2e8d3c41e5a3ef



--------------------------------

[ Upstream commit e142e9cd8891b0c6f277ac2c2c254199a6aa56e3 ]

The __must_hold annotation in io_match_task() uses a non existing
parameter "req", fix it.

Fixes: 6af3f48b ("io_uring: fix link traversal locking")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/3e65ee7709e96507cef3d93291746f2c489f2307.1721819383.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 4317740a

io_uring/timeout.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ void io_queue_linked_timeout(struct io_kiocb *req) 


static bool io_match_task(struct io_kiocb *head, struct task_struct *task,

			  bool cancel_all)

	__must_hold(&req->ctx->timeout_lock)

	__must_hold(&head->ctx->timeout_lock)

{

	struct io_kiocb *req;