[2/2] crypto: bcm: One function call less in do_shash() after error detection

Commit Message

SF Markus Elfring Feb. 14, 2018, 9:40 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Wed, 14 Feb 2018 22:22:20 +0100

The kfree() function was called in one case by the do_shash() function
during error handling even if the passed variable contained a null pointer.

* Reorder two function calls at the end.

* Add a jump target.

Signed-off-by: Markus Elfring <[e-mail]>
---
 drivers/crypto/bcm/util.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Herbert Xu Feb. 22, 2018, 1:42 p.m. UTC | #1

On Wed, Feb 14, 2018 at 10:40:26PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <[e-mail]>
> Date: Wed, 14 Feb 2018 22:22:20 +0100
> 
> The kfree() function was called in one case by the do_shash() function
> during error handling even if the passed variable contained a null pointer.
> 
> * Reorder two function calls at the end.
> 
> * Add a jump target.

This patch is pointless as kfree on NULL is a no-op.

Cheers,

SF Markus Elfring Feb. 23, 2018, 8:23 a.m. UTC | #2

> This patch is pointless as kfree on NULL is a no-op.

I prefer to avoid unnecessary function calls generally.

Regards,
Markus

Patch

diff --git a/drivers/crypto/bcm/util.c b/drivers/crypto/bcm/util.c
index a912c6ad3e85..c141a0242223 100644
--- a/drivers/crypto/bcm/util.c
+++ b/drivers/crypto/bcm/util.c
@@ -279,7 +279,7 @@  int do_shash(unsigned char *name, unsigned char *result,
 	sdesc = kmalloc(size, GFP_KERNEL);
 	if (!sdesc) {
 		rc = -ENOMEM;
-		goto do_shash_err;
+		goto free_shash;
 	}
 	sdesc->shash.tfm = hash;
 	sdesc->shash.flags = 0x0;
@@ -314,9 +314,9 @@  int do_shash(unsigned char *name, unsigned char *result,
 		pr_err("%s: Could not generate %s hash\n", __func__, name);
 
 do_shash_err:
-	crypto_free_shash(hash);
 	kfree(sdesc);
-
+free_shash:
+	crypto_free_shash(hash);
 	return rc;
 }