1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index cf6631056683..a601a427885c 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -690,6 +690,8 @@ bad3:
 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);
 }