From e084cdbe6352945b8ae0b9e228f19d634ff8d291 Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Fri, 19 Oct 2007 22:38:37 +0100
Subject: [PATCH] --- yaml --- r: 71709 b: refs/heads/master c:
 55b42c5ae9c048de25233434afc7b71b01bee9e6 h: refs/heads/master i:   71707:
 1e632591d7b6fc6f3ad5b83b5088586e09a6b28f v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/md/dm-crypt.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bc9c98a95463..5f27c80deee1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 027d50f92ea26fd065aeb141ebfcbbbe010825e3
+refs/heads/master: 55b42c5ae9c048de25233434afc7b71b01bee9e6
diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c
index 64fee90bb68b..ecd9ef0418cd 100644
--- a/trunk/drivers/md/dm-crypt.c
+++ b/trunk/drivers/md/dm-crypt.c
@@ -861,7 +861,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 		cc->iv_mode = kmalloc(strlen(ivmode) + 1, GFP_KERNEL);
 		if (!cc->iv_mode) {
 			ti->error = "Error kmallocing iv_mode string";
-			goto bad5;
+			goto bad_iv_mode;
 		}
 		strcpy(cc->iv_mode, ivmode);
 	} else
@@ -870,6 +870,8 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 	ti->private = cc;
 	return 0;
 
+bad_iv_mode:
+	dm_put_device(ti, cc->dev);
 bad5:
 	bioset_free(cc->bs);
 bad_bs: