From: Caleb Sander Mateos Date: Sun, 16 Feb 2025 22:58:59 +0000 (-0700) Subject: io_uring/rsrc: avoid NULL check in io_put_rsrc_node() X-Git-Tag: v6.15-rc1~124^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=496f56bf9f1acf11ce14489f34d81ba6e4023f42;p=thirdparty%2Fkernel%2Flinux.git io_uring/rsrc: avoid NULL check in io_put_rsrc_node() Most callers of io_put_rsrc_node() already check that node is non-NULL: - io_rsrc_data_free() - io_sqe_buffer_register() - io_reset_rsrc_node() - io_req_put_rsrc_nodes() (REQ_F_BUF_NODE indicates non-NULL buf_node) Only io_splice_cleanup() can call io_put_rsrc_node() with a NULL node. So move the NULL check there. Signed-off-by: Caleb Sander Mateos Link: https://lore.kernel.org/r/20250216225900.1075446-1-csander@purestorage.com Signed-off-by: Jens Axboe --- diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index 190f7ee45de93..a6d883c62b221 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -83,7 +83,7 @@ static inline struct io_rsrc_node *io_rsrc_node_lookup(struct io_rsrc_data *data static inline void io_put_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node *node) { lockdep_assert_held(&ctx->uring_lock); - if (node && !--node->refs) + if (!--node->refs) io_free_rsrc_node(ctx, node); } diff --git a/io_uring/splice.c b/io_uring/splice.c index 5b84f16306116..7b89bd84d486d 100644 --- a/io_uring/splice.c +++ b/io_uring/splice.c @@ -51,7 +51,8 @@ void io_splice_cleanup(struct io_kiocb *req) { struct io_splice *sp = io_kiocb_to_cmd(req, struct io_splice); - io_put_rsrc_node(req->ctx, sp->rsrc_node); + if (sp->rsrc_node) + io_put_rsrc_node(req->ctx, sp->rsrc_node); } static struct file *io_splice_get_file(struct io_kiocb *req,