From: Caleb Sander Mateos <csander@purestorage.com>
To: Jens Axboe <axboe@kernel.dk>, Pavel Begunkov <asml.silence@gmail.com>
Cc: Caleb Sander Mateos <csander@purestorage.com>,
io-uring@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] io_uring/rsrc: avoid NULL node check on io_sqe_buffer_register() failure
Date: Fri, 28 Feb 2025 16:59:13 -0700 [thread overview]
Message-ID: <20250228235916.670437-4-csander@purestorage.com> (raw)
In-Reply-To: <20250228235916.670437-1-csander@purestorage.com>
The done: label is only reachable if node is non-NULL. So don't bother
checking, just call io_free_node().
Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
---
io_uring/rsrc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 398c6f427bcc..95def9e5f3a7 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -835,12 +835,11 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx,
}
done:
if (ret) {
if (imu)
io_free_imu(ctx, imu);
- if (node)
- io_free_node(ctx, node);
+ io_free_node(ctx, node);
node = ERR_PTR(ret);
}
kvfree(pages);
return node;
}
--
2.45.2
next prev parent reply other threads:[~2025-02-28 23:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-28 23:59 [PATCH 1/5] io_uring/rsrc: split out io_free_node() helper Caleb Sander Mateos
2025-02-28 23:59 ` [PATCH 2/5] io_uring/rsrc: free io_rsrc_node using kfree() Caleb Sander Mateos
2025-02-28 23:59 ` [PATCH 3/5] io_uring/rsrc: call io_free_node() on io_sqe_buffer_register() failure Caleb Sander Mateos
2025-03-01 1:31 ` Pavel Begunkov
2025-03-01 2:23 ` Jens Axboe
2025-03-01 18:26 ` Caleb Sander Mateos
2025-02-28 23:59 ` Caleb Sander Mateos [this message]
2025-02-28 23:59 ` [PATCH 5/5] io_uring/rsrc: skip NULL file/buffer checks in io_free_rsrc_node() Caleb Sander Mateos
2025-03-03 7:20 ` [PATCH 1/5] io_uring/rsrc: split out io_free_node() helper lizetao
2025-03-04 14:17 ` 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=20250228235916.670437-4-csander@purestorage.com \
--to=csander@purestorage.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
--cc=linux-kernel@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