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

!6597 v3 Fix CVE-2024-26869 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VKCJNLWWLAQ3EHPVWTH5UBULXM5SD3UQ/ 
V3: change the patch header of the second patch.

V2: merge some missing patches.

V1: fix main error.

Chao Yu (3):
  f2fs: fix to invalidate META_MAPPING before DIO write
  f2fs: invalidate meta pages only for post_read required inode
  f2fs: fix to truncate meta inode pages forcely

Hyeong-Jun Kim (1):
  f2fs: invalidate META_MAPPING before IPU/DIO write


-- 
2.39.2
 
https://gitee.com/src-openeuler/kernel/issues/I9HKE5 
 
Link:https://gitee.com/openeuler/kernel/pulls/6597

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 48051149 d01db9cf

fs/f2fs/checkpoint.c

+3 −2
Original line number Diff line number Diff line
@@ -1551,8 +1551,9 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	 */

	if (f2fs_sb_has_encrypt(sbi) || f2fs_sb_has_verity(sbi) ||

		f2fs_sb_has_compression(sbi))

		invalidate_mapping_pages(META_MAPPING(sbi),

				MAIN_BLKADDR(sbi), MAX_BLKADDR(sbi) - 1);

		f2fs_bug_on(sbi,

			invalidate_inode_pages2_range(META_MAPPING(sbi),

				MAIN_BLKADDR(sbi), MAX_BLKADDR(sbi) - 1));



	f2fs_release_ino_entry(sbi, false);

fs/f2fs/data.c

+2 −2
Original line number Diff line number Diff line
@@ -1421,8 +1421,7 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type) 
	f2fs_allocate_data_block(sbi, NULL, old_blkaddr, &dn->data_blkaddr,

				&sum, seg_type, NULL);

	if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO)

		invalidate_mapping_pages(META_MAPPING(sbi),

					old_blkaddr, old_blkaddr);

		f2fs_truncate_meta_inode_pages(sbi, old_blkaddr, 1);

	f2fs_update_data_blkaddr(dn, dn->data_blkaddr);



	/*
@@ -2799,6 +2798,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted, 
		.submitted = false,

		.compr_blocks = compr_blocks,

		.need_lock = LOCK_RETRY,

		.post_read = f2fs_post_read_required(inode),

		.io_type = io_type,

		.io_wbc = wbc,

		.bio = bio,

fs/f2fs/f2fs.h

+27 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,7 @@ struct f2fs_io_info { 
	bool retry;		/* need to reallocate block address */

	int compr_blocks;	/* # of compressed block addresses */

	bool encrypted;		/* indicate file is encrypted */

	bool post_read;		/* require post read */

	enum iostat_type io_type;	/* io type */

	struct writeback_control *io_wbc; /* writeback control */

	struct bio **bio;		/* bio for ipu */
@@ -4126,6 +4127,32 @@ static inline bool is_journalled_quota(struct f2fs_sb_info *sbi) 
	return false;

}



static inline void f2fs_truncate_meta_inode_pages(struct f2fs_sb_info *sbi,

					block_t blkaddr, unsigned int cnt)

{

	bool need_submit = false;

	int i = 0;



	do {

		struct page *page;



		page = find_get_page(META_MAPPING(sbi), blkaddr + i);

		if (page) {

			if (PageWriteback(page))

				need_submit = true;

			f2fs_put_page(page, 0);

		}

	} while (++i < cnt && !need_submit);



	if (need_submit)

		f2fs_submit_merged_write_cond(sbi, sbi->meta_inode,

							NULL, 0, DATA);



	truncate_inode_pages_range(META_MAPPING(sbi),

			F2FS_BLK_TO_BYTES((loff_t)blkaddr),

			F2FS_BLK_END_BYTES((loff_t)(blkaddr + cnt - 1)));

}



#define EFSBADCRC	EBADMSG		/* Bad CRC detected */

#define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */

fs/f2fs/gc.c

+1 −2
Original line number Diff line number Diff line
@@ -1257,8 +1257,7 @@ static int move_data_block(struct inode *inode, block_t bidx, 
	memcpy(page_address(fio.encrypted_page),

				page_address(mpage), PAGE_SIZE);

	f2fs_put_page(mpage, 1);

	invalidate_mapping_pages(META_MAPPING(fio.sbi),

				fio.old_blkaddr, fio.old_blkaddr);

	f2fs_truncate_meta_inode_pages(fio.sbi, fio.old_blkaddr, 1);



	set_page_dirty(fio.encrypted_page);

	if (clear_page_dirty_for_io(fio.encrypted_page))

fs/f2fs/segment.c

+12 −5
Original line number Diff line number Diff line
@@ -2311,7 +2311,7 @@ void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr) 
	if (addr == NEW_ADDR || addr == COMPRESS_ADDR)

		return;



	invalidate_mapping_pages(META_MAPPING(sbi), addr, addr);

	f2fs_truncate_meta_inode_pages(sbi, addr, 1);



	/* add it into sit main buffer */

	down_write(&sit_i->sentry_lock);
@@ -3468,8 +3468,7 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio) 
	f2fs_allocate_data_block(fio->sbi, fio->page, fio->old_blkaddr,

			&fio->new_blkaddr, sum, type, fio);

	if (GET_SEGNO(fio->sbi, fio->old_blkaddr) != NULL_SEGNO)

		invalidate_mapping_pages(META_MAPPING(fio->sbi),

					fio->old_blkaddr, fio->old_blkaddr);

		f2fs_truncate_meta_inode_pages(fio->sbi, fio->old_blkaddr, 1);



	/* writeout dirty page into bdev */

	f2fs_submit_page_write(fio);
@@ -3554,6 +3553,9 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio) 
		return -EFSCORRUPTED;

	}



	if (fio->post_read)

		f2fs_truncate_meta_inode_pages(sbi, fio->new_blkaddr, 1);



	stat_inc_inplace_blocks(fio->sbi);



	if (fio->bio && !(SM_I(sbi)->ipu_policy & (1 << F2FS_IPU_NOCACHE)))
@@ -3640,8 +3642,7 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, 
		update_sit_entry(sbi, new_blkaddr, 1);

	}

	if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO) {

		invalidate_mapping_pages(META_MAPPING(sbi),

					old_blkaddr, old_blkaddr);

		f2fs_truncate_meta_inode_pages(sbi, old_blkaddr, 1);

		if (!from_gc)

			update_segment_mtime(sbi, old_blkaddr, 0);

		update_sit_entry(sbi, old_blkaddr, -1);
@@ -3720,10 +3721,16 @@ void f2fs_wait_on_block_writeback(struct inode *inode, block_t blkaddr) 
void f2fs_wait_on_block_writeback_range(struct inode *inode, block_t blkaddr,

								block_t len)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	block_t i;



	if (!f2fs_post_read_required(inode))

		return;



	for (i = 0; i < len; i++)

		f2fs_wait_on_block_writeback(inode, blkaddr + i);



	f2fs_truncate_meta_inode_pages(sbi, blkaddr, len);

}



static int read_compacted_summaries(struct f2fs_sb_info *sbi)