diff options
| author | Pankaj Raghav <p.raghav@samsung.com> | 2025-06-30 12:40:18 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-07-08 16:48:12 +0200 |
| commit | 25050181b61aa0153f3a378a5472d134f8e4ef25 (patch) | |
| tree | 65f9f5a249d74e3bd6ca7245da8a01c861dc418a | |
| parent | 77eb64439ad52d8afb57bb4dae24a2743c68f50d (diff) | |
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>
| -rw-r--r-- | fs/libfs.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/libfs.c b/fs/libfs.c index 4d1862f589e8..f99ecc300647 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1584,13 +1584,17 @@ EXPORT_SYMBOL(generic_file_fsync); int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks) { u64 last_fs_block = num_blocks - 1; - u64 last_fs_page = - last_fs_block >> (PAGE_SHIFT - blocksize_bits); + u64 last_fs_page, max_bytes; + + if (check_shl_overflow(num_blocks, blocksize_bits, &max_bytes)) + return -EFBIG; + + last_fs_page = (max_bytes >> PAGE_SHIFT) - 1; if (unlikely(num_blocks == 0)) return 0; - if ((blocksize_bits < 9) || (blocksize_bits > PAGE_SHIFT)) + if (blocksize_bits < 9) return -EINVAL; if ((last_fs_block > (sector_t)(~0ULL) >> (blocksize_bits - 9)) || |