dm raid1: fix leakage
authorDmitry Monakhov <dmonakhov@openvz.org>
Fri, 19 Oct 2007 21:38:39 +0000 (22:38 +0100)
committerAlasdair G Kergon <agk@redhat.com>
Sat, 20 Oct 2007 01:01:01 +0000 (02:01 +0100)
Add missing 'dm_io_client_destroy' to alloc_context error path.
Reorganize mirror constructor error path in order to prevent
workqueue leakage.

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
drivers/md/dm-raid1.c

index d09ff15490a5db439aff81566b02cf3f401b364a..6f60f307fae2ec3730f5e83ffa6367119c4cf433 100644 (file)
@@ -974,6 +974,7 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,
 
        if (rh_init(&ms->rh, ms, dl, region_size, ms->nr_regions)) {
                ti->error = "Error creating dirty region hash";
+               dm_io_client_destroy(ms->io_client);
                kfree(ms);
                return NULL;
        }
@@ -1163,16 +1164,14 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        ms->kmirrord_wq = create_singlethread_workqueue("kmirrord");
        if (!ms->kmirrord_wq) {
                DMERR("couldn't start kmirrord");
-               free_context(ms, ti, m);
-               return -ENOMEM;
+               r = -ENOMEM;
+               goto err_free_context;
        }
        INIT_WORK(&ms->kmirrord_work, do_mirror);
 
        r = parse_features(ms, argc, argv, &args_used);
-       if (r) {
-               free_context(ms, ti, ms->nr_mirrors);
-               return r;
-       }
+       if (r)
+               goto err_destroy_wq;
 
        argv += args_used;
        argc -= args_used;
@@ -1188,19 +1187,22 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
        if (argc) {
                ti->error = "Too many mirror arguments";
-               free_context(ms, ti, ms->nr_mirrors);
-               return -EINVAL;
+               r = -EINVAL;
+               goto err_destroy_wq;
        }
 
        r = kcopyd_client_create(DM_IO_PAGES, &ms->kcopyd_client);
-       if (r) {
-               destroy_workqueue(ms->kmirrord_wq);
-               free_context(ms, ti, ms->nr_mirrors);
-               return r;
-       }
+       if (r)
+               goto err_destroy_wq;
 
        wake(ms);
        return 0;
+
+err_destroy_wq:
+       destroy_workqueue(ms->kmirrord_wq);
+err_free_context:
+       free_context(ms, ti, ms->nr_mirrors);
+       return r;
 }
 
 static void mirror_dtr(struct dm_target *ti)