Commit 2dc8680c authored by Amir Goldstein's avatar Amir Goldstein Committed by Baokun Li
Browse files

io_uring: use kiocb_{start,end}_write() helpers 

stable inclusion
from stable-v5.10.230
commit f336622838e595868da703c4de4f892a3320de57
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=f336622838e595868da703c4de4f892a3320de57



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

Commit e484fd73 upstream.

Use helpers instead of the open coded dance to silence lockdep warnings.

Suggested-by: default avatarJan Kara <jack@suse.cz>
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-5-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 a02720a9

io_uring/io_uring.c

+4 −19
Original line number Diff line number Diff line
@@ -2679,15 +2679,10 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, long min) 


static void io_req_end_write(struct io_kiocb *req)

{

	/*

	 * Tell lockdep we inherited freeze protection from submission

	 * thread.

	 */

	if (req->flags & REQ_F_ISREG) {

		struct super_block *sb = file_inode(req->file)->i_sb;

		struct io_rw *rw = &req->rw;



		__sb_writers_acquired(sb, SB_FREEZE_WRITE);

		sb_end_write(sb);

		kiocb_end_write(&rw->kiocb);

	}

}
@@ -3780,18 +3775,8 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags) 
	if (unlikely(ret))

		goto out_free;



	/*

	 * Open-code file_start_write here to grab freeze protection,

	 * which will be released by another thread in

	 * io_complete_rw().  Fool lockdep by telling it the lock got

	 * released so that it doesn't complain about the held lock when

	 * we return to userspace.

	 */

	if (req->flags & REQ_F_ISREG) {

		sb_start_write(file_inode(req->file)->i_sb);

		__sb_writers_release(file_inode(req->file)->i_sb,

					SB_FREEZE_WRITE);

	}

	if (req->flags & REQ_F_ISREG)

		kiocb_start_write(kiocb);

	kiocb->ki_flags |= IOCB_WRITE;



	if (req->file->f_op->write_iter)