diff options
| author | Jin Qian <jinqian@google.com> | 2017-06-02 20:22:07 +0000 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-06-21 16:37:49 +0530 |
| commit | 2e320352b82fa3bb3c24adf1098be09c8724e0a3 (patch) | |
| tree | 7932882fb8569d05222d8f208757ddbd146b7540 /fs | |
| parent | 0f127e451bc737718431812019b87136521b7faa (diff) | |
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: 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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/segment.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index f77b3258454a..7965957dd0e6 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -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; } |