From: Li Lingfeng lilingfeng3@huawei.com
Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6BTWC
-------------------------------
This reverts commit ac02c0bf87ea4b239663211a3984c8d8b3a98be0.
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. Revert this patch and add it again after patch 788d0824269bef to reduce conflicts.
Signed-off-by: Li Lingfeng lilingfeng3@huawei.com Reviewed-by: Zhang Yi yi.zhang@huawei.com Reviewed-by: Wang Weiyang wangweiyang2@huawei.com Signed-off-by: Jialin Zhang zhangjialin11@huawei.com --- fs/io_uring.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c index adb8fcef738a..2397c2a1d919 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -6705,9 +6705,6 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr) err = io_submit_sqe(req, sqe, &link, &state.comp); if (err) goto fail_req; - /* to avoid doing too much in one submit round */ - if (submitted > IORING_MAX_ENTRIES / 2) - cond_resched(); }
if (unlikely(submitted != nr)) {