Commit cd0d1c7e authored by Li Lingfeng's avatar Li Lingfeng Committed by Jialin Zhang
Browse files

Revert "io_uring: fix soft lockup when call __io_remove_buffers" 

Offering: HULK
hulk inclusion
category: feature
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6BTWC



-------------------------------

This reverts commit 4222bec0.

We need to apply patch 788d0824269bef (io_uring: import 5.15-stable
io_uring) to move io_uring to separate directory and solve
the problem of CVE-2023-0240.
This patch can be reverted since patch 788d0824269bef contains it.

Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent de4d9efe

fs/io_uring.c

+0 −1
Original line number Diff line number Diff line
@@ -3945,7 +3945,6 @@ static int __io_remove_buffers(struct io_ring_ctx *ctx, struct io_buffer *buf, 
		kfree(nxt);

		if (++i == nbufs)

			return i;

		cond_resched();

	}

	i++;

	kfree(buf);