diff options
| author | Jin Qian <jinqian@android.com> | 2017-06-01 20:18:30 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-07-04 11:11:34 +0200 |
| commit | 21d3f8e1c3b7996ce239ab6fa82e9f7a8c47d84d (patch) | |
| tree | 3207702b08fcc6b3e729471efc17dd57dba4979d /fs | |
| parent | f2fs: fix a panic caused by NULL flush_cmd_control (diff) | |
| download | linux-21d3f8e1c3b7996ce239ab6fa82e9f7a8c47d84d.tar.xz linux-21d3f8e1c3b7996ce239ab6fa82e9f7a8c47d84d.zip | |
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>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/segment.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index c1026b78cdfc..a739803b6513 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2495,6 +2495,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; @@ -2521,6 +2523,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; } |