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

Commit 2781074d authored by Jin Qian's avatar Jin Qian Committed by Todd Poynor
Browse files

FROMLIST: 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: I94ad46eb3586cfcdd5f477a6caa2244b7d05da56
parent ca1d19b6

fs/f2fs/segment.c

+7 −0
Original line number Diff line number Diff line
@@ -1392,6 +1392,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;
@@ -1408,6 +1410,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;

}