From: Filipe Manana Date: Tue, 3 Feb 2026 15:14:01 +0000 (+0000) Subject: btrfs: remove duplicate system chunk array max size overflow check X-Git-Tag: v7.1-rc1~231^2~113 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f3da62571ba25bf6c71076ee21420ed5257b84eb;p=thirdparty%2Fkernel%2Flinux.git btrfs: remove duplicate system chunk array max size overflow check 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 Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 1b0eb246b7147..1b5fa06813311 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -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",