From c145a16be1f414caaec3572a6aa6cb681f53b601 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 12 Aug 2010 04:13:58 +0100
Subject: [PATCH] --- yaml --- r: 209153 b: refs/heads/master c:
 a9c88f2ebc1a5937915cb3b89c9f03894134f39a h: refs/heads/master i:   209151:
 b53da4c4418e9c58e8c90eca9eee20e4f16ae227 v: v3

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

diff --git a/[refs] b/[refs]
index 88f261d2501a..00ccbd850b6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 402ab352c2c00ba8f90c724565f8cf31210d99cf
+refs/heads/master: a9c88f2ebc1a5937915cb3b89c9f03894134f39a
diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c
index 3bdbb6115702..a8aab9cf26b9 100644
--- a/trunk/drivers/md/dm-crypt.c
+++ b/trunk/drivers/md/dm-crypt.c
@@ -1168,12 +1168,11 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 	if (ivmode && cc->iv_gen_ops) {
 		if (ivopts)
 			*(ivopts - 1) = ':';
-		cc->iv_mode = kmalloc(strlen(ivmode) + 1, GFP_KERNEL);
+		cc->iv_mode = kstrdup(ivmode, GFP_KERNEL);
 		if (!cc->iv_mode) {
 			ti->error = "Error kmallocing iv_mode string";
 			goto bad_ivmode_string;
 		}
-		strcpy(cc->iv_mode, ivmode);
 	} else
 		cc->iv_mode = NULL;