Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1492667
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 09/10] md/dm-crypt: Two checks and one function call less in crypt_iv_essiv_ctr() after error detection |
| Date | 2016-09-28 17:50 +0200 |
| Message-ID | <smpho-by-13@gated-at.bofh.it> (permalink) |
| References | <qEuGl-43C-5@gated-at.bofh.it> <smp7H-7L-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/10] md/dm-crypt: Fine-tuning for five function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-28 17:40 +0200
[PATCH 06/10] md/dm-crypt: Delete an unnecessary variable initialisation in crypt_set_key() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-28 17:50 +0200
[PATCH 04/10] md/dm-crypt: Delete an unnecessary variable initialisation in crypt_message() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-28 17:50 +0200
[PATCH 08/10] md/dm-crypt: Return directly after a failed crypto_alloc_ahash() in crypt_iv_essiv_ctr() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-28 17:50 +0200
[PATCH 05/10] md/dm-crypt: Rename a jump label in crypt_set_key() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-28 17:50 +0200
Re: [dm-devel] [PATCH 05/10] md/dm-crypt: Rename a jump label in crypt_set_key() Theodore Ts'o <tytso@mit.edu> - 2016-09-29 15:00 +0200
[PATCH 09/10] md/dm-crypt: Two checks and one function call less in crypt_iv_essiv_ctr() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-28 17:50 +0200
[PATCH 10/10] md/dm-crypt: Delete unnecessary variable initialisations in crypt_iv_essiv_ctr() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-28 17:50 +0200
[PATCH 03/10] md/dm-crypt: Rename a jump label in crypt_message() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-28 17:50 +0200
Re: [dm-devel] [PATCH 03/10] md/dm-crypt: Rename a jump label in crypt_message() Theodore Ts'o <tytso@mit.edu> - 2016-09-29 15:00 +0200
Re: [dm-devel] [PATCH 03/10] md/dm-crypt: Rename a jump label in crypt_message() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 17:50 +0200
Re: [dm-devel] [PATCH 03/10] md/dm-crypt: Rename a jump label in crypt_message() Dan Carpenter <dan.carpenter@oracle.com> - 2016-09-30 12:10 +0200
Re: md/dm-crypt: Rename a jump label in crypt_message() ? SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-30 13:40 +0200
Re: md/dm-crypt: Rename a jump label in crypt_message() ? Bjørn Mork <bjorn@mork.no> - 2016-09-30 13:50 +0200
Re: md/dm-crypt: Rename a jump label in crypt_message() ? SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-30 14:00 +0200
Re: md/dm-crypt: Rename a jump label in crypt_message() ? Bjørn Mork <bjorn@mork.no> - 2016-09-30 14:10 +0200
Re: md/dm-crypt: Rename a jump label in crypt_message() ? SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-30 15:00 +0200
Re: md/dm-crypt: Rename a jump label in crypt_message() ? Dan Carpenter <dan.carpenter@oracle.com> - 2016-09-30 14:10 +0200
Re: md/dm-crypt: Rename a jump label in crypt_message() ? SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-30 14:30 +0200
[PATCH 07/10] md/dm-crypt: Rename a jump label in crypt_iv_tcw_whitening() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-28 17:50 +0200
csiph-web