From: Pierre <pinaraf@pinaraf.info>
Date: Sun, 12 Nov 2017 14:24:32 +0000 (+0100)
Subject: crypto: ecc - Fix NULL pointer deref. on no default_rng
X-Git-Tag: archive/raspbian/4.15.4-1+rpi1^2~46
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af5de8689b18a055db2e837598baab559029d29b;p=linux.git

crypto: ecc - Fix NULL pointer deref. on no default_rng

If crypto_get_default_rng returns an error, the
function ecc_gen_privkey should return an error.
Instead, it currently tries to use the default_rng
nevertheless, thus creating a kernel panic with a
NULL pointer dereference.
Returning the error directly, as was supposedly
intended when looking at the code, fixes this.

Signed-off-by: Pierre Ducroquet <pinaraf@pinaraf.info>
Reviewed-by: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name crypto-ecc-fix-null-pointer-deref.-on-no-default_rng.patch
---

diff --git a/crypto/ecc.c b/crypto/ecc.c
index 633a9bcdc57..18f32f2a5e1 100644
--- a/crypto/ecc.c
+++ b/crypto/ecc.c
@@ -964,7 +964,7 @@ int ecc_gen_privkey(unsigned int curve_id, unsigned int ndigits, u64 *privkey)
 	 * DRBG with a security strength of 256.
 	 */
 	if (crypto_get_default_rng())
-		err = -EFAULT;
+		return -EFAULT;
 
 	err = crypto_rng_get_bytes(crypto_default_rng, (u8 *)priv, nbytes);
 	crypto_put_default_rng();