1 files changed, 93 insertions, 87 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index a8aab9cf26b9..139bbe2254cd 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -999,6 +999,45 @@ static int crypt_wipe_key(struct crypt_config *cc)
         return crypto_ablkcipher_setkey(cc->tfm, cc->key, cc->key_size);
 }
 
+static void crypt_dtr(struct dm_target *ti)
+{
+        struct crypt_config *cc = ti->private;
+
+        ti->private = NULL;
+
+        if (!cc)
+                return;
+
+        if (cc->io_queue)
+                destroy_workqueue(cc->io_queue);
+        if (cc->crypt_queue)
+                destroy_workqueue(cc->crypt_queue);
+
+        if (cc->bs)
+                bioset_free(cc->bs);
+
+        if (cc->page_pool)
+                mempool_destroy(cc->page_pool);
+        if (cc->req_pool)
+                mempool_destroy(cc->req_pool);
+        if (cc->io_pool)
+                mempool_destroy(cc->io_pool);
+
+        if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)
+                cc->iv_gen_ops->dtr(cc);
+
+        if (cc->tfm && !IS_ERR(cc->tfm))
+                crypto_free_ablkcipher(cc->tfm);
+
+        if (cc->dev)
+                dm_put_device(ti, cc->dev);
+
+        kfree(cc->iv_mode);
+
+        /* Must zero key material before freeing */
+        kzfree(cc);
+}
+
 /*
  * Construct an encryption mapping:
  * <cipher> <key> <iv_offset> <dev_path> <start>
@@ -1006,7 +1045,6 @@ static int crypt_wipe_key(struct crypt_config *cc)
 static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 {
         struct crypt_config *cc;
-        struct crypto_ablkcipher *tfm;
         char *tmp;
         char *cipher;
         char *chainmode;
@@ -1014,6 +1052,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         char *ivopts;
         unsigned int key_size;
         unsigned long long tmpll;
+        int ret = -EINVAL;
 
         if (argc != 5) {
                 ti->error = "Not enough arguments";
@@ -1032,12 +1071,13 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         key_size = strlen(argv[1]) >> 1;
 
         cc = kzalloc(sizeof(*cc) + key_size * sizeof(u8), GFP_KERNEL);
-        if (cc == NULL) {
-                ti->error =
-                        "Cannot allocate transparent encryption context";
+        if (!cc) {
+                ti->error = "Cannot allocate transparent encryption context";
                 return -ENOMEM;
         }
 
+        ti->private = cc;
+
         /* Compatibility mode for old dm-crypt cipher strings */
         if (!chainmode || (strcmp(chainmode, "plain") == 0 && !ivmode)) {
                 chainmode = "cbc";
@@ -1046,35 +1086,36 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         if (strcmp(chainmode, "ecb") && !ivmode) {
                 ti->error = "This chaining mode requires an IV mechanism";
-                goto bad_cipher;
+                goto bad;
         }
 
+        ret = -ENOMEM;
         if (snprintf(cc->cipher, CRYPTO_MAX_ALG_NAME, "%s(%s)",
                      chainmode, cipher) >= CRYPTO_MAX_ALG_NAME) {
                 ti->error = "Chain mode + cipher name is too long";
-                goto bad_cipher;
+                goto bad;
         }
 
-        tfm = crypto_alloc_ablkcipher(cc->cipher, 0, 0);
-        if (IS_ERR(tfm)) {
+        cc->tfm = crypto_alloc_ablkcipher(cc->cipher, 0, 0);
+        if (IS_ERR(cc->tfm)) {
                 ti->error = "Error allocating crypto tfm";
-                goto bad_cipher;
+                goto bad;
         }
 
         strcpy(cc->cipher, cipher);
         strcpy(cc->chainmode, chainmode);
-        cc->tfm = tfm;
 
-        if (crypt_set_key(cc, argv[1]) < 0) {
+        ret = crypt_set_key(cc, argv[1]);
+        if (ret < 0) {
                 ti->error = "Error decoding and setting key";
-                goto bad_ivmode;
+                goto bad;
         }
 
         /*
          * Choose ivmode. Valid modes: "plain", "essiv:<esshash>", "benbi".
          * See comments at iv code
          */
-
+        ret = -EINVAL;
         if (ivmode == NULL)
                 cc->iv_gen_ops = NULL;
         else if (strcmp(ivmode, "plain") == 0)
@@ -1089,20 +1130,28 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 cc->iv_gen_ops = &crypt_iv_null_ops;
         else {
                 ti->error = "Invalid IV mode";
-                goto bad_ivmode;
+                goto bad;
         }
 
-        if (cc->iv_gen_ops && cc->iv_gen_ops->ctr &&
-            cc->iv_gen_ops->ctr(cc, ti, ivopts) < 0)
-                goto bad_ivmode;
+        /* Allocate IV */
+        if (cc->iv_gen_ops && cc->iv_gen_ops->ctr) {
+                ret = cc->iv_gen_ops->ctr(cc, ti, ivopts);
+                if (ret < 0) {
+                        ti->error = "Error creating IV";
+                        goto bad;
+                }
+        }
 
-        if (cc->iv_gen_ops && cc->iv_gen_ops->init &&
-            cc->iv_gen_ops->init(cc) < 0) {
-                ti->error = "Error initialising IV";
-                goto bad_slab_pool;
+        /* Initialize IV (set keys for ESSIV etc) */
+        if (cc->iv_gen_ops && cc->iv_gen_ops->init) {
+                ret = cc->iv_gen_ops->init(cc);
+                if (ret < 0) {
+                        ti->error = "Error initialising IV";
+                        goto bad;
+                }
         }
 
-        cc->iv_size = crypto_ablkcipher_ivsize(tfm);
+        cc->iv_size = crypto_ablkcipher_ivsize(cc->tfm);
         if (cc->iv_size)
                 /* at least a 64 bit sector number should fit in our buffer */
                 cc->iv_size = max(cc->iv_size,
@@ -1116,62 +1165,65 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 }
         }
 
+        ret = -ENOMEM;
         cc->io_pool = mempool_create_slab_pool(MIN_IOS, _crypt_io_pool);
         if (!cc->io_pool) {
                 ti->error = "Cannot allocate crypt io mempool";
-                goto bad_slab_pool;
+                goto bad;
         }