imsm: FIX: Check correct slots on disk failure

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index 79564c544ca04d3fd6fac9b24ac0f279f51559bb..5d1548b20329f3f434ca04661fa19a777e81eb32 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -554,14 +554,16 @@ int Create(struct supertype *st, char *mddev,
        /* We need to create the device */
        map_lock(&map);
        mdfd = create_mddev(mddev, name, autof, LOCAL, chosen_name);
-       if (mdfd < 0)
+       if (mdfd < 0) {
+               map_unlock(&map);
                return 1;
+       }
        mddev = chosen_name;
 
        vers = md_get_version(mdfd);
        if (vers < 9000) {
                fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
-               goto abort;
+               goto abort_locked;
        } else {
                mdu_array_info_t inf;
                memset(&inf, 0, sizeof(inf));
@@ -569,7 +571,7 @@ int Create(struct supertype *st, char *mddev,
                if (inf.working_disks != 0) {
                        fprintf(stderr, Name ": another array by this name"
                                " is already running.\n");
-                       goto abort;
+                       goto abort_locked;
                }
        }
 
@@ -665,7 +667,7 @@ int Create(struct supertype *st, char *mddev,
                }
        }
        if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid))
-               goto abort;
+               goto abort_locked;
 
        total_slots = info.array.nr_disks;
        st->ss->getinfo_super(st, &info, NULL);
@@ -788,6 +790,10 @@ int Create(struct supertype *st, char *mddev,
        }
 
        infos = malloc(sizeof(*infos) * total_slots);
+       if (!infos) {
+               fprintf(stderr, Name ": Unable to allocate memory\n");
+               goto abort;
+       }
 
        for (pass=1; pass <=2 ; pass++) {
                struct mddev_dev *moved_disk = NULL; /* the disk that was moved out of the insert point */
@@ -910,7 +916,7 @@ int Create(struct supertype *st, char *mddev,
                                        Name ": Failed to write metadata to %s\n",
                                        dv->devname);
                                st->ss->free_super(st);
-                               goto abort;
+                               goto abort_locked;
                        }
 
                        /* update parent container uuid */
@@ -993,6 +999,7 @@ int Create(struct supertype *st, char *mddev,
 
  abort:
        map_lock(&map);
+ abort_locked:
        map_remove(&map, fd2devnum(mdfd));
        map_unlock(&map);