]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
btrfs: remove duplicate system chunk array max size overflow check
authorFilipe Manana <fdmanana@suse.com>
Tue, 3 Feb 2026 15:14:01 +0000 (15:14 +0000)
committerDavid Sterba <dsterba@suse.com>
Tue, 7 Apr 2026 16:55:52 +0000 (18:55 +0200)
We check it twice, once in validate_sys_chunk_array() and then again in
its caller, btrfs_validate_super(), right after it calls
validate_sys_chunk_array(). So remove the duplicated check from
btrfs_validate_super().

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/disk-io.c

index 1b0eb246b7147ab79816c3545f81364f07169541..1b5fa0681331120da48d737b67ffdd4f972a5015 100644 (file)
@@ -2545,12 +2545,6 @@ int btrfs_validate_super(const struct btrfs_fs_info *fs_info,
         * Obvious sys_chunk_array corruptions, it must hold at least one key
         * and one chunk
         */
-       if (btrfs_super_sys_array_size(sb) > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) {
-               btrfs_err(fs_info, "system chunk array too big %u > %u",
-                         btrfs_super_sys_array_size(sb),
-                         BTRFS_SYSTEM_CHUNK_ARRAY_SIZE);
-               ret = -EINVAL;
-       }
        if (btrfs_super_sys_array_size(sb) < sizeof(struct btrfs_disk_key)
                        + sizeof(struct btrfs_chunk)) {
                btrfs_err(fs_info, "system chunk array too small %u < %zu",