From: Jens Axboe <axboe@kernel.dk>
To: Xin Yin <yinxin_1989@aliyun.com>, viro@zeniv.linux.org.uk
Cc: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] io_uring: Fix NULL pointer dereference in io_sq_wq_submit_work()
Date: Mon, 31 Aug 2020 21:38:59 -0600 [thread overview]
Message-ID: <ae9f3887-5205-8aa8-afa7-4e01d03921bc@kernel.dk> (raw)
In-Reply-To: <20200901015442.44831-1-yinxin_1989@aliyun.com>
On 8/31/20 7:54 PM, Xin Yin wrote:
> the commit <1c4404efcf2c0> ("<io_uring: make sure async workqueue
> is canceled on exit>") caused a crash in io_sq_wq_submit_work().
> when io_ring-wq get a req form async_list, which may not have been
> added to task_list. Then try to delete the req from task_list will caused
> a "NULL pointer dereference".
Hmm, do you have a reproducer for this?
> @@ -2356,9 +2358,11 @@ static void io_sq_wq_submit_work(struct work_struct *work)
> * running. We currently only allow this if the new request is sequential
> * to the previous one we punted.
> */
> -static bool io_add_to_prev_work(struct async_list *list, struct io_kiocb *req)
> +static bool io_add_to_prev_work(struct async_list *list, struct io_kiocb *req,
> + struct io_ring_ctx *ctx)
> {
> bool ret;
> + unsigned long flags;
>
> if (!list)
> return false;
> @@ -2378,6 +2382,13 @@ static bool io_add_to_prev_work(struct async_list *list, struct io_kiocb *req)
> list_del_init(&req->list);
> ret = false;
> }
> +
> + if (ret) {
> + spin_lock_irqsave(&ctx->task_lock, flags);
> + list_add(&req->task_list, &ctx->task_list);
> + req->work_task = NULL;
> + spin_unlock_irqrestore(&ctx->task_lock, flags);
> + }
> spin_unlock(&list->lock);
> return ret;
> }
> @@ -2454,7 +2465,7 @@ static int __io_queue_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
> s->sqe = sqe_copy;
> memcpy(&req->submit, s, sizeof(*s));
> list = io_async_list_from_req(ctx, req);
> - if (!io_add_to_prev_work(list, req)) {
> + if (!io_add_to_prev_work(list, req, ctx)) {
> if (list)
> atomic_inc(&list->cnt);
> INIT_WORK(&req->work, io_sq_wq_submit_work);
>
ctx == req->ctx, so you should not need that change.
--
Jens Axboe
next parent reply other threads:[~2020-09-01 3:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200901015442.44831-1-yinxin_1989@aliyun.com>
2020-09-01 3:38 ` Jens Axboe [this message]
[not found] ` <67f27d17-81fa-43a8-baa9-429b1ccd65d0.yinxin_1989@aliyun.com>
2020-09-01 14:52 ` [PATCH] io_uring: Fix NULL pointer dereference in io_sq_wq_submit_work() Jens Axboe
2020-09-01 20:01 ` Jens Axboe
2020-09-01 20:12 ` Jens Axboe
[not found] <20200902015948.109580-1-yinxin_1989@aliyun.com>
2020-09-02 2:12 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ae9f3887-5205-8aa8-afa7-4e01d03921bc@kernel.dk \
--to=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yinxin_1989@aliyun.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).