Commit 92611cf6 authored by Amir Goldstein's avatar Amir Goldstein Committed by Baokun Li
Browse files

io_uring: rename kiocb_end_write() local helper 

stable inclusion
from stable-v5.10.230
commit 955089c2403c5c75755629517d235ad99650a03c
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB5KQC
CVE: CVE-2024-53052

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=955089c2403c5c75755629517d235ad99650a03c



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

Commit a370167f upstream.

This helper does not take a kiocb as input and we want to create a
common helper by that name that takes a kiocb as input.

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Message-Id: <20230817141337.1025891-2-amir73il@gmail.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
parent 87bba796

io_uring/io_uring.c

+4 −4
Original line number Diff line number Diff line
@@ -2677,7 +2677,7 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, long min) 
	return ret;

}



static void kiocb_end_write(struct io_kiocb *req)

static void io_req_end_write(struct io_kiocb *req)

{

	/*

	 * Tell lockdep we inherited freeze protection from submission
@@ -2747,7 +2747,7 @@ static void io_req_io_end(struct io_kiocb *req) 
	struct io_rw *rw = &req->rw;



	if (rw->kiocb.ki_flags & IOCB_WRITE) {

		kiocb_end_write(req);

		io_req_end_write(req);

		fsnotify_modify(req->file);

	} else {

		fsnotify_access(req->file);
@@ -2827,7 +2827,7 @@ static void io_complete_rw_iopoll(struct kiocb *kiocb, long res, long res2) 
	struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw.kiocb);



	if (kiocb->ki_flags & IOCB_WRITE)

		kiocb_end_write(req);

		io_req_end_write(req);

	if (unlikely(res != req->result)) {

		if (res == -EAGAIN && io_rw_should_reissue(req)) {

			req->flags |= REQ_F_REISSUE;
@@ -3827,7 +3827,7 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags) 
		ret = io_setup_async_rw(req, iovec, inline_vecs, iter, false);

		if (!ret) {

			if (kiocb->ki_flags & IOCB_WRITE)

				kiocb_end_write(req);

				io_req_end_write(req);

			return -EAGAIN;

		}

		return ret;