Skip to content

Commit 2505018

Browse files
Panky-codesbrauner
authored andcommitted
fs/libfs: don't assume blocksize <= PAGE_SIZE in generic_check_addressable
Since [1], it is possible for filesystems to have blocksize > PAGE_SIZE of the system. Remove the assumption and make the check generic for all blocksizes in generic_check_addressable(). [1] https://lore.kernel.org/linux-xfs/20240822135018.1931258-1-kernel@pankajraghav.com/ Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> Link: https://lore.kernel.org/20250630104018.213985-1-p.raghav@samsung.com Reviewed-by: Zhang Yi <yi.zhang@huawei.com> Reviewed-by: Baokun Li <libaokun1@huawei.com> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 77eb644 commit 2505018

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

fs/libfs.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,13 +1584,17 @@ EXPORT_SYMBOL(generic_file_fsync);
15841584
int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks)
15851585
{
15861586
u64 last_fs_block = num_blocks - 1;
1587-
u64 last_fs_page =
1588-
last_fs_block >> (PAGE_SHIFT - blocksize_bits);
1587+
u64 last_fs_page, max_bytes;
1588+
1589+
if (check_shl_overflow(num_blocks, blocksize_bits, &max_bytes))
1590+
return -EFBIG;
1591+
1592+
last_fs_page = (max_bytes >> PAGE_SHIFT) - 1;
15891593

15901594
if (unlikely(num_blocks == 0))
15911595
return 0;
15921596

1593-
if ((blocksize_bits < 9) || (blocksize_bits > PAGE_SHIFT))
1597+
if (blocksize_bits < 9)
15941598
return -EINVAL;
15951599

15961600
if ((last_fs_block > (sector_t)(~0ULL) >> (blocksize_bits - 9)) ||

0 commit comments

Comments
 (0)