[PATCH] crypto: fix null-ptr-dereference in rng_setentropy

Dave Sun posted 1 patch 1 day, 20 hours ago
crypto/algif_rng.c | 3 +++
1 file changed, 3 insertions(+)
[PATCH] crypto: fix null-ptr-dereference in rng_setentropy
Posted by Dave Sun 1 day, 20 hours ago
When CONFIG_CRYPTO_USER_API_RNG_CAVP is enable,
algif_type_rng->setentropy = rng_setentropy.
If we setsockopt on a af_alg socket binding a rng
algorithm with ALG_SET_DRBG_ENTROPY opt, kernel will
run to ->set_ent in rng_setentropy.

Since struct rng_alg like jent_alg dose not set set_ent
which default value is 0, null-ptr-dereference will happen.

Check ->set_ent before call it.

Signed-off-by: Yiqi Sun <sunyiqixm@gmail.com>
---
 crypto/algif_rng.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto/algif_rng.c b/crypto/algif_rng.c
index 10c41adac3b1..26a75c54192b 100644
--- a/crypto/algif_rng.c
+++ b/crypto/algif_rng.c
@@ -303,6 +303,9 @@ static int __maybe_unused rng_setentropy(void *private, sockptr_t entropy,
 			return PTR_ERR(kentropy);
 	}
 
+	if (!crypto_rng_alg(pctx->drng)->set_ent)
+		return -EOPNOTSUPP;
+
 	crypto_rng_alg(pctx->drng)->set_ent(pctx->drng, kentropy, len);
 	/*
 	 * Since rng doesn't perform any memory management for the entropy
-- 
2.34.1