diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-11-14 12:40:30 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-11-26 15:53:57 -0800 |
| commit | 4e240d1bab1ead280ddf5eb05058dba6bbd57d10 (patch) | |
| tree | 953b09a8ef1c047346d43a569004b914f2c4eed5 /fs/f2fs | |
| parent | 1e771e83ce26d0ba2ce6c7df7effb7822f032c4a (diff) | |
| download | linux-4e240d1bab1ead280ddf5eb05058dba6bbd57d10.tar.gz linux-4e240d1bab1ead280ddf5eb05058dba6bbd57d10.tar.bz2 linux-4e240d1bab1ead280ddf5eb05058dba6bbd57d10.zip | |
f2fs: check memory boundary by insane namelen
If namelen is corrupted to have very long value, fill_dentries can copy
wrong memory area.
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/dir.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index bacc667950b6..c0c845da12fa 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -808,6 +808,17 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, de_name.name = d->filename[bit_pos]; de_name.len = le16_to_cpu(de->name_len); + /* check memory boundary before moving forward */ + bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len)); + if (unlikely(bit_pos > d->max)) { + f2fs_msg(sbi->sb, KERN_WARNING, + "%s: corrupted namelen=%d, run fsck to fix.", + __func__, le16_to_cpu(de->name_len)); + set_sbi_flag(sbi, SBI_NEED_FSCK); + err = -EINVAL; + goto out; + } + if (f2fs_encrypted_inode(d->inode)) { int save_len = fstr->len; @@ -830,7 +841,6 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, if (readdir_ra) f2fs_ra_node_page(sbi, le32_to_cpu(de->ino)); - bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len)); ctx->pos = start_pos + bit_pos; } out: |