Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19e117a5 authored by Jin Qian's avatar Jin Qian Committed by Greg Kroah-Hartman
Browse files

f2fs: sanity check size of nat and sit cache 



commit 21d3f8e1c3b7996ce239ab6fa82e9f7a8c47d84d upstream.

Make sure number of entires doesn't exceed max journal size.

Signed-off-by: default avatarJin Qian <jinqian@android.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 58d2eacd

fs/f2fs/segment.c

+7 −0
Original line number Diff line number Diff line
@@ -1805,6 +1805,8 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type) 


static int restore_curseg_summaries(struct f2fs_sb_info *sbi)

{

	struct f2fs_journal *sit_j = CURSEG_I(sbi, CURSEG_COLD_DATA)->journal;

	struct f2fs_journal *nat_j = CURSEG_I(sbi, CURSEG_HOT_DATA)->journal;

	int type = CURSEG_HOT_DATA;

	int err;
@@ -1831,6 +1833,11 @@ static int restore_curseg_summaries(struct f2fs_sb_info *sbi) 
			return err;

	}



	/* sanity check for summary blocks */

	if (nats_in_cursum(nat_j) > NAT_JOURNAL_ENTRIES ||

			sits_in_cursum(sit_j) > SIT_JOURNAL_ENTRIES)

		return -EINVAL;



	return 0;

}