]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
mdadm/Detail: Can't show container name correctly when unpluging disks
authorXiao Ni <xni@redhat.com>
Wed, 27 Oct 2021 12:23:14 +0000 (20:23 +0800)
committerJes Sorensen <jsorensen@fb.com>
Tue, 2 Nov 2021 16:09:51 +0000 (12:09 -0400)
The test case is:
1. create one imsm container
2. create a raid5 device from the container
3. unplug two disks
4. mdadm --detail /dev/md126
[root@rhel85 ~]# mdadm -D /dev/md126
/dev/md126:
         Container : ��, member 0

The Detail function first gets container name by function
map_dev_preferred. Then it tries to find which disks are
available. In patch db5377883fef(It should be FAILED..)
uses map_dev_preferred to find which disks are under /dev.

But now, the major/minor information comes from kernel space.
map_dev_preferred malloc memory and init a device list when
first be called by Detail. It can't find the device in the
list by the major/minor. It free the memory and reinit the
list.

The container name now points to an area tha has been freed.
So the containt is a mess.

This patch replaces map_dev_preferred with access.

Fixes: db5377883fef (It should be FAILED when raid has)
Signed-off-by: Xiao Ni <xni@redhat.com>
Reported-by: Fine Fan <ffan@redhat.com>
Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Detail.c

index d3af0ab5dc95378346da65e918a97a27e67b55ee..95d4cc7006b27062a45eaf5817950bc09cff8e51 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -351,14 +351,14 @@ int Detail(char *dev, struct context *c)
        avail = xcalloc(array.raid_disks, 1);
 
        for (d = 0; d < array.raid_disks; d++) {
-               char *dv, *dv_rep;
-               dv = map_dev_preferred(disks[d*2].major,
-                               disks[d*2].minor, 0, c->prefer);
-               dv_rep = map_dev_preferred(disks[d*2+1].major,
-                               disks[d*2+1].minor, 0, c->prefer);
-
-               if ((dv && (disks[d*2].state & (1<<MD_DISK_SYNC))) ||
-                   (dv_rep && (disks[d*2+1].state & (1<<MD_DISK_SYNC)))) {
+               char dv[PATH_MAX], dv_rep[PATH_MAX];
+               snprintf(dv, PATH_MAX, "/sys/dev/block/%d:%d",
+                       disks[d*2].major, disks[d*2].minor);
+               snprintf(dv_rep, PATH_MAX, "/sys/dev/block/%d:%d",
+                       disks[d*2+1].major, disks[d*2+1].minor);
+
+               if ((is_dev_alive(dv) && (disks[d*2].state & (1<<MD_DISK_SYNC))) ||
+                   (is_dev_alive(dv_rep) && (disks[d*2+1].state & (1<<MD_DISK_SYNC)))) {
                        avail_disks ++;
                        avail[d] = 1;
                } else