diff options
| author | Ocean Chen <oceanchen@google.com> | 2019-07-08 12:34:56 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-31 07:28:55 +0200 |
| commit | 6d94cefc3dc2775848feee2027868d0039865bb7 (patch) | |
| tree | 2e69480e63dccce5a3f296d60af6b976083177d3 /fs | |
| parent | 29df800668ae2e0d7d0c8fb30b269c426a3887fd (diff) | |
| download | linux-stable-6d94cefc3dc2775848feee2027868d0039865bb7.tar.gz linux-stable-6d94cefc3dc2775848feee2027868d0039865bb7.tar.bz2 linux-stable-6d94cefc3dc2775848feee2027868d0039865bb7.zip | |
f2fs: avoid out-of-range memory access
[ Upstream commit 56f3ce675103e3fb9e631cfb4131fc768bc23e9a ]
blkoff_off might over 512 due to fs corrupt or security
vulnerability. That should be checked before being using.
Use ENTRIES_IN_SUM to protect invalid value in cur_data_blkoff.
Signed-off-by: Ocean Chen <oceanchen@google.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/segment.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 70bd15cadb44..18d51c36a5e3 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2612,6 +2612,11 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi) seg_i = CURSEG_I(sbi, i); segno = le32_to_cpu(ckpt->cur_data_segno[i]); blk_off = le16_to_cpu(ckpt->cur_data_blkoff[i]); + if (blk_off > ENTRIES_IN_SUM) { + f2fs_bug_on(sbi, 1); + f2fs_put_page(page, 1); + return -EFAULT; + } seg_i->next_segno = segno; reset_curseg(sbi, i, 0); seg_i->alloc_type = ckpt->alloc_type[i]; |