evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

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

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

Change-Id: I0db498cdc996ec204f56617bba5c4ab5ac6ade14
This commit is contained in:
Jin Qian 2017-06-02 20:22:07 +00:00
parent 8cbdbb9a6a
commit 57e54f4120
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/f2fs/segment.c
View file

@ -1623,6 +1623,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;
@ -1649,6 +1653,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;
}