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

Commit 8abfc1c1 authored by Jin Qian's avatar Jin Qian
Browse files

BACKPORT: f2fs: sanity check size of nat and sit cache 



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

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJin Qian <jinqian@android.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>

(url https://sourceforge.net/p/linux-f2fs/mailman/message/35872032)
Bug: 36819470

Change-Id: I0db498cdc996ec204f56617bba5c4ab5ac6ade14
parent b4cff5a9

fs/f2fs/segment.c

+9 −0
Original line number Diff line number Diff line
@@ -1392,6 +1392,10 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type) 


static int restore_curseg_summaries(struct f2fs_sb_info *sbi)

{

	struct f2fs_summary_block *s_sits =

		CURSEG_I(sbi, CURSEG_COLD_DATA)->sum_blk;

	struct f2fs_summary_block *s_nats =

		CURSEG_I(sbi, CURSEG_HOT_DATA)->sum_blk;

	int type = CURSEG_HOT_DATA;

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

	}



	/* sanity check for summary blocks */

	if (nats_in_cursum(s_nats) > NAT_JOURNAL_ENTRIES ||

			sits_in_cursum(s_sits) > SIT_JOURNAL_ENTRIES)

		return -EINVAL;



	return 0;

}