Merge "BACKPORT: f2fs: add a max block check for get_data_block_bmap" (29042a19) · Commits · e / devices / android_kernel_xiaomi_markw

fs/f2fs/data.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -737,6 +737,15 @@ int f2fs_fiemap(struct inode inode, struct fiemap_extent_info fieinfo,
		start, len, get_data_block_fiemap);
		}

		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)))
		return -EFBIG;
		return get_data_block_ro(inode, iblock, bh_result, create);
		}

		static int f2fs_read_data_page(struct file file, struct page page)
		{
		struct inode *inode = page->mapping->host;
		@@ -1153,7 +1162,7 @@ static sector_t f2fs_bmap(struct address_space *mapping, sector_t block)
		if (f2fs_has_inline_data(inode))
		return 0;

		return generic_block_bmap(mapping, block, get_data_block);
		return generic_block_bmap(mapping, block, get_data_block_bmap);
		}

		const struct address_space_operations f2fs_dblock_aops = {

+1 −0

Original line number	Diff line number	Diff line
		@@ -1246,6 +1246,7 @@ static inline int f2fs_add_link(struct dentry dentry, struct inode inode)
		/*
		* super.c
		*/
		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 *, ...);

+1 −1

Original line number	Diff line number	Diff line
		@@ -752,7 +752,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;