| Message ID | 20240604121242.2661244-1-suhui@nfschina.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | io_uring/io-wq: avoid garbge value of 'match' in io_wq_enqueue() | expand |
On Tue, 04 Jun 2024 20:12:43 +0800, Su Hui wrote: > Clang static checker (scan-build) warning: > o_uring/io-wq.c:line 1051, column 3 > The expression is an uninitialized value. The computed value will > also be garbage. > > 'match.nr_pending' is used in io_acct_cancel_pending_work(), but it is > not initialized. Change the order of assignment for 'match' to fix > this problem. > > [...] Applied, thanks! [1/1] io_uring/io-wq: avoid garbge value of 'match' in io_wq_enqueue() commit: e87863ed45a1c36b0d8a5b70134caf8c794d8d57 Best regards,
diff --git a/io_uring/io-wq.c b/io_uring/io-wq.c index d1c47a9d9215..7d3316fe9bfc 100644 --- a/io_uring/io-wq.c +++ b/io_uring/io-wq.c @@ -927,7 +927,11 @@ void io_wq_enqueue(struct io_wq *wq, struct io_wq_work *work) { struct io_wq_acct *acct = io_work_get_acct(wq, work); unsigned long work_flags = work->flags; - struct io_cb_cancel_data match; + struct io_cb_cancel_data match = { + .fn = io_wq_work_match_item, + .data = work, + .cancel_all = false, + }; bool do_create; /* @@ -965,10 +969,6 @@ void io_wq_enqueue(struct io_wq *wq, struct io_wq_work *work) raw_spin_unlock(&wq->lock); /* fatal condition, failed to create the first worker */ - match.fn = io_wq_work_match_item, - match.data = work, - match.cancel_all = false, - io_acct_cancel_pending_work(wq, acct, &match); } }
Clang static checker (scan-build) warning: o_uring/io-wq.c:line 1051, column 3 The expression is an uninitialized value. The computed value will also be garbage. 'match.nr_pending' is used in io_acct_cancel_pending_work(), but it is not initialized. Change the order of assignment for 'match' to fix this problem. Fixes: 42abc95f05bf ("io-wq: decouple work_list protection from the big wqe->lock") Signed-off-by: Su Hui <suhui@nfschina.com> --- io_uring/io-wq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)