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

!6444 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/AKCROCS6IU5KVURX5TTXEBDDR5LGGCOK/ 
Fix CVE-2024-26869.

Chao Yu (2):
  f2fs: introduce f2fs_invalidate_internal_cache() for cleanup
  f2fs: fix to truncate meta inode pages forcely


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

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents a5346226 8c439a18

fs/f2fs/checkpoint.c

+3 −2
Original line number Diff line number Diff line
@@ -1587,8 +1587,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

+3 −5
Original line number Diff line number Diff line
@@ -1492,11 +1492,9 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type) 
	old_blkaddr = dn->data_blkaddr;

	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_invalidate_compress_page(sbi, old_blkaddr);

	}

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

		f2fs_invalidate_internal_cache(sbi, old_blkaddr);



	f2fs_update_data_blkaddr(dn, dn->data_blkaddr);

	return 0;

}

fs/f2fs/f2fs.h

+33 −0
Original line number Diff line number Diff line
@@ -4604,6 +4604,39 @@ static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi) 
	return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);

}



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)));

}



static inline void f2fs_invalidate_internal_cache(struct f2fs_sb_info *sbi,

								block_t blkaddr)

{

	f2fs_truncate_meta_inode_pages(sbi, blkaddr, 1);

	f2fs_invalidate_compress_page(sbi, blkaddr);

}



#define EFSBADCRC	EBADMSG		/* Bad CRC detected */

#define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */

fs/f2fs/gc.c

+2 −3
Original line number Diff line number Diff line
@@ -1380,9 +1380,8 @@ 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_invalidate_compress_page(fio.sbi, fio.old_blkaddr);



	f2fs_invalidate_internal_cache(fio.sbi, fio.old_blkaddr);



	set_page_dirty(fio.encrypted_page);

	if (clear_page_dirty_for_io(fio.encrypted_page))

fs/f2fs/segment.c

+6 −13
Original line number Diff line number Diff line
@@ -2495,8 +2495,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_invalidate_compress_page(sbi, addr);

	f2fs_invalidate_internal_cache(sbi, addr);



	/* add it into sit main buffer */

	down_write(&sit_i->sentry_lock);
@@ -3557,11 +3556,8 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio) 
reallocate:

	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_invalidate_compress_page(fio->sbi, fio->old_blkaddr);

	}

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

		f2fs_invalidate_internal_cache(fio->sbi, fio->old_blkaddr);



	/* writeout dirty page into bdev */

	f2fs_submit_page_write(fio);
@@ -3655,8 +3651,7 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio) 
	}



	if (fio->post_read)

		invalidate_mapping_pages(META_MAPPING(sbi),

				fio->new_blkaddr, fio->new_blkaddr);

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



	stat_inc_inplace_blocks(fio->sbi);
@@ -3757,9 +3752,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_invalidate_compress_page(sbi, old_blkaddr);

		f2fs_invalidate_internal_cache(sbi, old_blkaddr);

		if (!from_gc)

			update_segment_mtime(sbi, old_blkaddr, 0);

		update_sit_entry(sbi, old_blkaddr, -1);
@@ -3848,7 +3841,7 @@ void f2fs_wait_on_block_writeback_range(struct inode *inode, block_t blkaddr, 
	for (i = 0; i < len; i++)

		f2fs_wait_on_block_writeback(inode, blkaddr + i);



	invalidate_mapping_pages(META_MAPPING(sbi), blkaddr, blkaddr + len - 1);

	f2fs_truncate_meta_inode_pages(sbi, blkaddr, len);

}



static int read_compacted_summaries(struct f2fs_sb_info *sbi)