]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
crypto: drbg - kzfree does not need a check for NULL pointer
authorStephan Mueller <smueller@chronox.de>
Sun, 17 Aug 2014 15:37:59 +0000 (17:37 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 25 Aug 2014 12:34:09 +0000 (20:34 +0800)
The kzfree function already performs the NULL pointer check. Therefore,
the DRBG code does not need to implement such check.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/drbg.c

index d86c67792e617e3ab89af03c082078daf55079f8..910e1883191637d77a4ebe06e42e726daa120c86 100644 (file)
@@ -1153,8 +1153,7 @@ static int drbg_seed(struct drbg_state *drbg, struct drbg_string *pers,
        drbg->reseed_ctr = 1;
 
 out:
-       if (entropy)
-               kzfree(entropy);
+       kzfree(entropy);
        return ret;
 }
 
@@ -1163,19 +1162,15 @@ static inline void drbg_dealloc_state(struct drbg_state *drbg)
 {
        if (!drbg)
                return;
-       if (drbg->V)
-               kzfree(drbg->V);
+       kzfree(drbg->V);
        drbg->V = NULL;
-       if (drbg->C)
-               kzfree(drbg->C);
+       kzfree(drbg->C);
        drbg->C = NULL;
-       if (drbg->scratchpad)
-               kzfree(drbg->scratchpad);
+       kzfree(drbg->scratchpad);
        drbg->scratchpad = NULL;
        drbg->reseed_ctr = 0;
 #ifdef CONFIG_CRYPTO_FIPS
-       if (drbg->prev)
-               kzfree(drbg->prev);
+       kzfree(drbg->prev);
        drbg->prev = NULL;
        drbg->fips_primed = false;
 #endif
@@ -1295,8 +1290,7 @@ static int drbg_make_shadow(struct drbg_state *drbg, struct drbg_state **shadow)
        return 0;
 
 err:
-       if (tmp)
-               kzfree(tmp);
+       kzfree(tmp);
        return ret;
 }