Re: [PATCH v2] f2fs: add a max block check for get_data_block_bmap

[Chao Yu <chao2.yu@samsung.com>]

Hi all,

> -----Original Message-----
> From: Yunlei He [mailto:heyunlei@huawei.com]
> Sent: Monday, December 28, 2015 9:49 PM
> To: linux-f2fs-devel@lists.sourceforge.net; jaegeuk@kernel.org; chao2.yu@samsung.com
> Cc: bintian.wang@huawei.com; Yunlei He; Xue Liu
> Subject: [f2fs-dev][PATCH v2] f2fs: add a max block check for get_data_block_bmap
> 
> This patch adds a max block check for get_data_block_bmap.
> 
> Trinity test program will send a block number as parameter into
> ioctl_fibmap, which will be used in get_node_path(), when the block
> number large than f2fs max blocks, it will trigger kernel bug.
> 
> Signed-off-by: Yunlei He <heyunlei@huawei.com>
> Signed-off-by: Xue Liu <liuxueliu.liu@huawei.com>
> ---
>  fs/f2fs/data.c  | 4 ++++
>  fs/f2fs/f2fs.h  | 1 +
>  fs/f2fs/super.c | 2 +-
>  3 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index e34b1bd..51cbf68 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -741,6 +741,10 @@ static int get_data_block_dio(struct inode *inode, sector_t iblock,
>  static int get_data_block_bmap(struct inode *inode, sector_t iblock,
>  			struct buffer_head *bh_result, int create)
>  {
> +	/* Block number less than F2FS MAX BLOCKS */
> +	if (unlikely(iblock > max_file_size(0)))

Should be iblock >= max_file_size(0).

Thanks,

> +		return -EFBIG;
> +
>  	return __get_data_block(inode, iblock, bh_result, create,
>  						F2FS_GET_BLOCK_BMAP);
>  }
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 19beabe..e248b8da 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -1724,6 +1724,7 @@ static inline int f2fs_add_link(struct dentry *dentry, struct inode *inode)
>   * super.c
>   */
>  int f2fs_commit_super(struct f2fs_sb_info *, bool);
> +loff_t max_file_size(unsigned bits);
>  int f2fs_sync_fs(struct super_block *, int);
>  extern __printf(3, 4)
>  void f2fs_msg(struct super_block *, const char *, const char *, ...);
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index c3070c1..4075402 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -906,7 +906,7 @@ static const struct export_operations f2fs_export_ops = {
>  	.get_parent = f2fs_get_parent,
>  };
> 
> -static loff_t max_file_size(unsigned bits)
> +loff_t max_file_size(unsigned bits)
>  {
>  	loff_t result = (DEF_ADDRS_PER_INODE - F2FS_INLINE_XATTR_ADDRS);
>  	loff_t leaf_count = ADDRS_PER_BLOCK;
> --
> 1.9.1



------------------------------------------------------------------------------