From 33dfcf0bee2622987ace26d45a6f1796edf4db87 Mon Sep 17 00:00:00 2001
From: Stefan Rompf <stefan@loplof.de>
Date: Fri, 6 Jan 2006 00:20:08 -0800
Subject: [PATCH] --- yaml --- r: 16524 b: refs/heads/master c:
 9d3520a339d62f942085e9888f66905eb8b350bd h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/md/dm-crypt.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4472927795fd..e5d731433fba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b56306e56784d0513e1193d58c05a6bd97bd1a9
+refs/heads/master: 9d3520a339d62f942085e9888f66905eb8b350bd
diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c
index cf6631056683..a601a427885c 100644
--- a/trunk/drivers/md/dm-crypt.c
+++ b/trunk/drivers/md/dm-crypt.c
@@ -690,6 +690,8 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 bad2:
 	crypto_free_tfm(tfm);
 bad1:
+	/* Must zero key material before freeing */
+	memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8));
 	kfree(cc);
 	return -EINVAL;
 }
@@ -706,6 +708,9 @@ static void crypt_dtr(struct dm_target *ti)
 		cc->iv_gen_ops->dtr(cc);
 	crypto_free_tfm(cc->tfm);
 	dm_put_device(ti, cc->dev);
+
+	/* Must zero key material before freeing */
+	memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8));
 	kfree(cc);
 }