Fix possible NULL ptr dereferences and memory leaks

[thirdparty/mdadm.git] / super-ddf.c

diff --git a/super-ddf.c b/super-ddf.c
index 8cda23a740307e99bb16b6200231c416a1afa7c8..abbc8b09c6174ee5dfde0bdf1f9c92da8635ffbc 100644 (file)
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -5125,13 +5125,16 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
         */
        vc = find_vdcr(ddf, a->info.container_member, rv->disk.raid_disk,
                       &n_bvd, &vcl);
-       if (vc == NULL)
+       if (vc == NULL) {
+               free(rv);
                return NULL;
+       }
 
        mu = xmalloc(sizeof(*mu));
        if (posix_memalign(&mu->space, 512, sizeof(struct vcl)) != 0) {
                free(mu);
-               mu = NULL;
+               free(rv);
+               return NULL;
        }
 
        mu->len = ddf->conf_rec_len * 512 * vcl->conf.sec_elmnt_count;
@@ -5161,6 +5164,8 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
                        pr_err("BUG: can't find disk %d (%d/%d)\n",
                               di->disk.raid_disk,
                               di->disk.major, di->disk.minor);
+                       free(mu);
+                       free(rv);
                        return NULL;
                }
                vc->phys_refnum[i_prim] = ddf->phys->entries[dl->pdnum].refnum;