]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
mdadm/ddf: Abort when raid disk is smaller in getinfo_super_ddf
authorXiao Ni <xni@redhat.com>
Wed, 11 Oct 2023 13:03:32 +0000 (21:03 +0800)
committerJes Sorensen <jes@trained-monkey.org>
Thu, 26 Oct 2023 21:47:29 +0000 (17:47 -0400)
The metadata is corrupted when the raid_disk<0. So abort directly.
This also can avoid a building error:
super-ddf.c:1988:58: error: array subscript -1 is below array bounds of ‘struct phys_disk_entry[0]’

Suggested-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
Ackedy-by: Xiao Ni <xni@redhat.com>
Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
super-ddf.c

index c5242654df3cb6ac328ade1416157e241733d10f..7571e3b740c60c5e4ed74243050f57fa25695f37 100644 (file)
@@ -1984,12 +1984,14 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *m
                info->disk.number = be32_to_cpu(ddf->dlist->disk.refnum);
                info->disk.raid_disk = find_phys(ddf, ddf->dlist->disk.refnum);
 
+               if (info->disk.raid_disk < 0)
+                       return;
+
                info->data_offset = be64_to_cpu(ddf->phys->
                                                  entries[info->disk.raid_disk].
                                                  config_size);
                info->component_size = ddf->dlist->size - info->data_offset;
-               if (info->disk.raid_disk >= 0)
-                       pde = ddf->phys->entries + info->disk.raid_disk;
+               pde = ddf->phys->entries + info->disk.raid_disk;
                if (pde &&
                    !(be16_to_cpu(pde->state) & DDF_Failed) &&
                    !(be16_to_cpu(pde->state) & DDF_Missing))