Commit beeb460c authored Apr 06, 2020 by Eric Biggers Committed by Herbert Xu Apr 16, 2020

crypto: algapi - Avoid spurious modprobe on LOADED



Currently after any algorithm is registered and tested, there's an
unnecessary request_module("cryptomgr") even if it's already loaded.
Also, CRYPTO_MSG_ALG_LOADED is sent twice, and thus if the algorithm is
"crct10dif", lib/crc-t10dif.c replaces the tfm twice rather than once.

This occurs because CRYPTO_MSG_ALG_LOADED is sent using
crypto_probing_notify(), which tries to load "cryptomgr" if the
notification is not handled (NOTIFY_DONE).  This doesn't make sense
because "cryptomgr" doesn't handle this notification.

Fix this by using crypto_notify() instead of crypto_probing_notify().

Fixes: dd8b083f ("crypto: api - Introduce notifier for new crypto algorithms")
Cc: <stable@vger.kernel.org> # v4.20+
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 56b80bde

crypto/algapi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -403,7 +403,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval)
		err = wait_for_completion_killable(&larval->completion);
		WARN_ON(err);
		if (!err)
		crypto_probing_notify(CRYPTO_MSG_ALG_LOADED, larval);
		crypto_notify(CRYPTO_MSG_ALG_LOADED, larval);

		out:
		crypto_larval_kill(&larval->alg);

Admin message