Skip to content

Commit 2a816e4

Browse files
committed
Merge tag 'io_uring-6.13-20241213' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe: "A single fix for a regression introduced in the 6.13 merge window" * tag 'io_uring-6.13-20241213' of git://git.kernel.dk/linux: io_uring/rsrc: don't put/free empty buffers
2 parents 1c021e7 + 99d6af6 commit 2a816e4

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

io_uring/rsrc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,8 +1036,10 @@ static int io_clone_buffers(struct io_ring_ctx *ctx, struct io_ring_ctx *src_ctx
10361036
out_put_free:
10371037
i = data.nr;
10381038
while (i--) {
1039-
io_buffer_unmap(src_ctx, data.nodes[i]);
1040-
kfree(data.nodes[i]);
1039+
if (data.nodes[i]) {
1040+
io_buffer_unmap(src_ctx, data.nodes[i]);
1041+
kfree(data.nodes[i]);
1042+
}
10411043
}
10421044
out_unlock:
10431045
io_rsrc_data_free(ctx, &data);

0 commit comments

Comments
 (0)