crypto: adiantum - initialize crypto_spawn::inst
PATCH 1/2 crypto: adiantum - initialize crypto_spawn::inst
From: Eric Biggers <[email protected]>
crypto_grab_*() doesn't set crypto_spawn::inst, so templates must set it beforehand. Otherwise it will be left NULL, which causes a crash in certain cases where algorithms are dynamically loaded/unloaded. E.g. with CONFIG_CRYPTO_CHACHA20_X86_64=m, the following caused a crash:
insmod chacha-x86_64.ko
python -c 'import socket; socket.socket(socket.AF_ALG, 5, 0).bind(("skcipher", "adiantum(xchacha12,aes)"))'
rmmod chacha-x86_64.ko
python -c 'import socket; socket.socket(socket.AF_ALG, 5, 0).bind(("skcipher", "adiantum(xchacha12,aes)"))'--- crypto/adiantum.c | 4 ++++ 1 file changed, 4 insertions(+)
crypto/adiantum.c +4 -0
@@ -539,6 +539,8 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb) ictx =skcipher_instance_ctx (inst);/* Stream cipher, e.g. "xchacha12" */ +crypto_set_skcipher_spawn (&ictx->streamcipher_spawn, +skcipher_crypto_instance (inst)); err =crypto_grab_skcipher (&ictx->streamcipher_spawn, streamcipher_name,0 ,crypto_requires_sync (algt->type, algt->mask));
@@ -547,6 +549,8 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb) streamcipher_alg =crypto_spawn_skcipher_alg (&ictx->streamcipher_spawn);/* Block cipher, e.g. "aes" */ +crypto_set_spawn (&ictx->blockcipher_spawn, +skcipher_crypto_instance (inst)); err =crypto_grab_spawn (&ictx->blockcipher_spawn, blockcipher_name,CRYPTO_ALG_TYPE_CIPHER ,CRYPTO_ALG_TYPE_MASK );if (err)
Signature · 1 line
2.20.1
PATCH 2/2 crypto: algapi - reject NULL crypto_spawn::inst
From: Eric Biggers <[email protected]>
It took me a while to notice the bug where the adiantum template left crypto_spawn::inst == NULL, because this only caused problems in certain cases where algorithms are dynamically loaded/unloaded.
More improvements are needed, but for now make crypto_init_spawn() reject this case and WARN(), so this type of bug will be noticed immediately in the future.
Note: I checked all callers and the adiantum template was the only place that had this wrong. So this WARN shouldn't trigger anymore.
--- crypto/algapi.c | 3 +++ 1 file changed, 3 insertions(+)
crypto/algapi.c +3 -0
@@ -608,6 +608,9 @@ int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg, {int err = -EAGAIN ; +if (WARN_ON_ONCE (inst ==NULL )) +return -EINVAL ; + spawn->inst = inst; spawn->mask = mask;
Signature · 1 line
2.20.1
Herbert Xu
maintainerRe: [PATCH 2/2] crypto: algapi - reject NULL crypto_spawn::inst
Quoted 10 lines · Eric Biggers
From: Eric Biggers <[email protected]>
It took me a while to notice the bug where the adiantum template left
crypto_spawn::inst== NULL, because this only caused problems in certain cases where algorithms are dynamically loaded/unloaded.More improvements are needed, but for now make
crypto_init_spawn()reject this case andWARN(), so this type of bug will be noticed immediately in the future.
Quoted 7 lines
Note: I checked all callers and the adiantum template was the only place that had this wrong. So this WARN shouldn't trigger anymore.
Signed-off-by Eric Biggers <[email protected]>--- crypto/algapi.c | 3 +++ 1 file changed, 3 insertions(+)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Herbert Xu
maintainerQuoted 12 lines · Eric Biggers
From: Eric Biggers <[email protected]>
crypto_grab_*() doesn't set
crypto_spawn::inst, so templates must set it beforehand. Otherwise it will be left NULL, which causes a crash in certain cases where algorithms are dynamically loaded/unloaded. E.g. withCONFIG_CRYPTO_CHACHA20_X86_64=m, the following caused a crash:insmod chacha-x86_64.ko python -c 'import socket; socket.socket(socket.AF_ALG, 5, 0).bind(("skcipher", "adiantum(xchacha12,aes)"))' rmmod chacha-x86_64.ko python -c 'import socket; socket.socket(socket.AF_ALG, 5, 0).bind(("skcipher", "adiantum(xchacha12,aes)"))'
Quoted 5 lines
Fixes 059c2a4d8e16 ("crypto: adiantum - add Adiantum support")Signed-off-by Eric Biggers <[email protected]>--- crypto/adiantum.c | 4 ++++ 1 file changed, 4 insertions(+)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt