From: Jens Axboe <axboe@kernel.dk>
To: Pavel Begunkov <asml.silence@gmail.com>,
io-uring@vger.kernel.org, linux-block@vger.kernel.org
Subject: Re: [PATCH 3/3] io_uring: use inlined struct sqe_submit
Date: Tue, 5 Nov 2019 16:37:00 -0700 [thread overview]
Message-ID: <589994ea-6528-eac0-e0c6-b496ee5bebd2@kernel.dk> (raw)
In-Reply-To: <e9f1f564ec60748c4ad266ec6bace9b2df392b58.1572993994.git.asml.silence@gmail.com>
On 11/5/19 4:04 PM, Pavel Begunkov wrote:
> @@ -2475,31 +2475,30 @@ static int __io_queue_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
> return ret;
> }
>
> -static int io_queue_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
> - struct sqe_submit *s)
> +static int io_queue_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req)
> {
> int ret;
>
> - ret = io_req_defer(ctx, req, s->sqe);
> + ret = io_req_defer(ctx, req);
> if (ret) {
> if (ret != -EIOCBQUEUED) {
> io_free_req(req, NULL);
> - io_cqring_add_event(ctx, s->sqe->user_data, ret);
> + io_cqring_add_event(ctx, req->submit.sqe->user_data, ret);
Cases like these are now (or can be) use-after-free. Same with this one:
> @@ -2507,12 +2506,12 @@ static int io_queue_link_head(struct io_ring_ctx *ctx, struct io_kiocb *req,
> * list.
> */
> req->flags |= REQ_F_IO_DRAIN;
> - ret = io_req_defer(ctx, req, s->sqe);
> + ret = io_req_defer(ctx, req);
> if (ret) {
> if (ret != -EIOCBQUEUED) {
> io_free_req(req, NULL);
> __io_free_req(shadow);
> - io_cqring_add_event(ctx, s->sqe->user_data, ret);
> + io_cqring_add_event(ctx, req->submit.sqe->user_data, ret);
> return 0;
Free the req, then deref it...
--
Jens Axboe
next prev parent reply other threads:[~2019-11-05 23:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 23:04 [RFC 0/3] Inline sqe_submit Pavel Begunkov
2019-11-05 23:04 ` [PATCH 1/3] io_uring: allocate io_kiocb upfront Pavel Begunkov
2019-11-05 23:04 ` [PATCH 2/3] io_uring: Use submit info inlined into req Pavel Begunkov
2019-11-05 23:42 ` Jens Axboe
2019-11-05 23:04 ` [PATCH 3/3] io_uring: use inlined struct sqe_submit Pavel Begunkov
2019-11-05 23:37 ` Jens Axboe [this message]
2019-11-05 23:43 ` Pavel Begunkov
2019-11-05 23:37 ` [RFC 0/3] Inline sqe_submit Jens Axboe
2019-11-05 23:45 ` Pavel Begunkov
2019-11-05 23:48 ` 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=589994ea-6528-eac0-e0c6-b496ee5bebd2@kernel.dk \
--to=axboe@kernel.dk \
--cc=asml.silence@gmail.com \
--cc=io-uring@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
/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).