Unverified Commit 8bb1c3d5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6443 f2fs: fix NULL pointer dereference in f2fs_submit_page_write() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QK6MBIDDVINE5GORVPELO3QHRT3H55OQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9HKBD 
 
Link:https://gitee.com/openeuler/kernel/pulls/6443

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents d12310fd 4e63e458

fs/f2fs/data.c

+4 −4
Original line number Diff line number Diff line
@@ -1080,10 +1080,6 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) 
	io->last_block_in_bio = fio->new_blkaddr;



	trace_f2fs_submit_page_write(fio->page, fio);

skip:

	if (fio->in_list)

		goto next;

out:

#ifdef CONFIG_BLK_DEV_ZONED

	if (f2fs_sb_has_blkzoned(sbi) && btype < META &&

			is_end_zone_blkaddr(sbi, fio->new_blkaddr)) {
@@ -1096,6 +1092,10 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) 
		__submit_merged_bio(io);

	}

#endif

skip:

	if (fio->in_list)

		goto next;

out:

	if (is_sbi_flag_set(sbi, SBI_IS_SHUTDOWN) ||

				!f2fs_is_checkpoint_ready(sbi))

		__submit_merged_bio(io);