diff options
| author |   Sheng Yong <shengyong1@huawei.com> | 2019-01-07 15:02:34 +0800 |
|---|---|---|
| committer |   Jaegeuk Kim <jaegeuk@kernel.org> | 2019-01-22 15:31:26 -0800 |
| commit | 720db068634c91553a8e1d9a0fcd8c7050e06d2b (patch) | |
| tree | 49dcd7e73e0adb95f9aa0e4bb4b4671e49fb9f18 /fs/f2fs | |
| parent | f2fs: fix to trigger fsck if dirent.name_len is zero (diff) | |
| download | linux-dev-720db068634c91553a8e1d9a0fcd8c7050e06d2b.tar.xz linux-dev-720db068634c91553a8e1d9a0fcd8c7050e06d2b.zip | |
f2fs: check if file namelen exceeds max value
Dentry bitmap is not enough to detect incorrect dentries. So this patch
also checks the namelen value of a dentry.
Signed-off-by: Gong Chen <gongchen4@huawei.com>
Signed-off-by: Sheng Yong <shengyong1@huawei.com>
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 926166528cd4..ba7535399d95 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -814,7 +814,8 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, /* check memory boundary before moving forward */ bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len)); - if (unlikely(bit_pos > d->max)) { + if (unlikely(bit_pos > d->max || + le16_to_cpu(de->name_len) > F2FS_NAME_LEN)) { f2fs_msg(sbi->sb, KERN_WARNING, "%s: corrupted namelen=%d, run fsck to fix.", __func__, le16_to_cpu(de->name_len)); |