Commit 454587fe authored by Chao Yu's avatar Chao Yu Committed by Zizhi Wo
Browse files

f2fs: introduce f2fs_invalidate_internal_cache() for cleanup 

mainline inclusion
from mainline-v6.8-rc1
commit 4e4f1eb9949b10cb7d76370fd27d41f20ef2b32b
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9HKE5
CVE: CVE-2024-26869

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



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

Just cleanup, no logic changes.

Signed-off-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarZizhi Wo <wozizhi@huawei.com>
parent 0c8d7c88

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

+7 −0
Original line number Diff line number Diff line
@@ -4604,6 +4604,13 @@ 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_invalidate_internal_cache(struct f2fs_sb_info *sbi,

								block_t blkaddr)

{

	invalidate_mapping_pages(META_MAPPING(sbi), blkaddr, blkaddr);

	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

+4 −10
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);
@@ -3757,9 +3753,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);