Commit 3273d8ad authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix to do cast in F2FS_{BLK_TO_BYTES, BTYES_TO_BLK} to avoid overflow 



It missed to cast variable to unsigned long long type before
bit shift, which will cause overflow, fix it.

Fixes: f7ef9b83 ("f2fs: introduce macros to convert bytes and blocks in f2fs")
Signed-off-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 789ca0eb

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -3344,7 +3344,7 @@ loff_t max_file_blocks(struct inode *inode) 
	 * fit within U32_MAX + 1 data units.

	 */



	result = min(result, F2FS_BYTES_TO_BLK(((loff_t)U32_MAX + 1) * 4096));

	result = umin(result, F2FS_BYTES_TO_BLK(((loff_t)U32_MAX + 1) * 4096));



	return result;

}

include/linux/f2fs_fs.h

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#define NEW_ADDR		((block_t)-1)	/* used as block_t addresses */

#define COMPRESS_ADDR		((block_t)-2)	/* used as compressed data flag */



#define F2FS_BYTES_TO_BLK(bytes)	((bytes) >> F2FS_BLKSIZE_BITS)

#define F2FS_BLK_TO_BYTES(blk)		((blk) << F2FS_BLKSIZE_BITS)

#define F2FS_BYTES_TO_BLK(bytes)	((unsigned long long)(bytes) >> F2FS_BLKSIZE_BITS)

#define F2FS_BLK_TO_BYTES(blk)		((unsigned long long)(blk) << F2FS_BLKSIZE_BITS)

#define F2FS_BLK_END_BYTES(blk)		(F2FS_BLK_TO_BYTES(blk + 1) - 1)

#define F2FS_BLK_ALIGN(x)		(F2FS_BYTES_TO_BLK((x) + F2FS_BLKSIZE - 1))