Commit 2a816e4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1c021e79 99d6af6e

io_uring/rsrc.c

+4 −2
Original line number Diff line number Diff line
@@ -1036,9 +1036,11 @@ static int io_clone_buffers(struct io_ring_ctx *ctx, struct io_ring_ctx *src_ctx 
out_put_free:

	i = data.nr;

	while (i--) {

		if (data.nodes[i]) {

			io_buffer_unmap(src_ctx, data.nodes[i]);

			kfree(data.nodes[i]);

		}

	}

out_unlock:

	io_rsrc_data_free(ctx, &data);

	mutex_unlock(&src_ctx->uring_lock);