[PATCH 09/10] md/dm-crypt: Two checks and one function call less in crypt_iv_essiv_ctr() after error detection
From: SF Markus Elfring <hidden>
Date: 2016-09-28 15:46:23
Also in:
dm-devel, kernel-janitors, lkml
Subsystem:
device-mapper (lvm), the rest · Maintainers:
Alasdair Kergon, Mike Snitzer, Mikulas Patocka, Benjamin Marzinski, Linus Torvalds
From: Markus Elfring <redacted> Date: Wed, 28 Sep 2016 16:38:37 +0200 The kfree() function was called in one case by the crypt_iv_essiv_ctr() function during error handling even if the passed variable "salt" contained a null pointer. * Adjust a jump target according to the Linux coding style convention. * Delete this function call and a condition check which became unnecessary with this refactoring. Signed-off-by: Markus Elfring <redacted> --- drivers/md/dm-crypt.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 47f6265..53a9155 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c@@ -382,7 +382,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti, if (!salt) { ti->error = "Error kmallocing salt storage in ESSIV"; err = -ENOMEM; - goto bad; + goto free_hash; } cc->iv_gen_private.essiv.salt = salt;
@@ -397,11 +397,8 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti, cc->iv_private = essiv_tfm; return 0; - -bad: - if (hash_tfm && !IS_ERR(hash_tfm)) - crypto_free_ahash(hash_tfm); - kfree(salt); +free_hash: + crypto_free_ahash(hash_tfm); return err; }
--
2.10.0