x86 AEGIS fixes
Subsystems (4)
cover x86 AEGIS fixes
Since the legacy crypto API likes to randomly allocate memory, the x86 AEGIS code has some bugs. This series fixes them.
Eric Biggers (2):
crypto: x86/aegis - Fix sleeping when disallowed on PREEMPT_RT
crypto: x86/aegis - Add missing error checks
arch/x86/crypto/aegis128-aesni-glue.c | 40 +++++++++++++++++++-------- 1 file changed, 29 insertions(+), 11 deletions(-)
base-commit: 181698af38d3f93381229ad89c09b5bd0496661a
Signature · 1 line
2.50.0
PATCH 1/2 crypto: x86/aegis - Fix sleeping when disallowed on PREEMPT_RT
skcipher_walk_done() can call kfree(), which takes a spinlock, which makes it incorrect to call while preemption is disabled on PREEMPT_RT. Therefore, end the kernel-mode FPU section before calling skcipher_walk_done(), and restart it afterwards.
Moreover, pass atomic=false to skcipher_walk_aead_encrypt() instead of atomic=true. The point of atomic=true was to make skcipher_walk_done() safe to call while in a kernel-mode FPU section, but that does not actually work. So just use the usual atomic=false.
--- arch/x86/crypto/aegis128-aesni-glue.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/x86/crypto/aegis128-aesni-glue.c +6 -2
@@ -117,11 +117,13 @@ crypto_aegis128_aesni_process_crypt(struct aegis_state *state,else aegis128_aesni_dec (state, walk->src.virt.addr, walk->dst.virt.addr,round_down (walk->nbytes,AEGIS128_BLOCK_SIZE )); +kernel_fpu_end ();skcipher_walk_done (walk, walk->nbytes %AEGIS128_BLOCK_SIZE ); +kernel_fpu_begin (); }if (walk->nbytes) {if (enc) aegis128_aesni_enc_tail(state, walk->src.virt.addr,
@@ -129,11 +131,13 @@ crypto_aegis128_aesni_process_crypt(struct aegis_state *state, walk->nbytes); else aegis128_aesni_dec_tail(state, walk->src.virt.addr, walk->dst.virt.addr, walk->nbytes); +kernel_fpu_end ();skcipher_walk_done (walk,0 ); +kernel_fpu_begin (); } }static struct aegis_ctx *crypto_aegis128_aesni_ctx (struct crypto_aead *aead) {
@@ -174,13 +178,13 @@ crypto_aegis128_aesni_crypt(struct aead_request *req,struct aegis_ctx *ctx =crypto_aegis128_aesni_ctx (tfm);struct skcipher_walk walk;struct aegis_state state;if (enc) -skcipher_walk_aead_encrypt (&walk, req, true); +skcipher_walk_aead_encrypt (&walk, req, false);else -skcipher_walk_aead_decrypt (&walk, req, true); +skcipher_walk_aead_decrypt (&walk, req, false);kernel_fpu_begin ();aegis128_aesni_init (&state, &ctx->key, req->iv);crypto_aegis128_aesni_process_ad (&state, req->src, req->assoclen);
Signature · 1 line
2.50.0
PATCH 2/2 crypto: x86/aegis - Add missing error checks
In reply to Eric BiggersThe skcipher_walk functions can allocate memory and can fail, so checking for errors is necessary.
--- arch/x86/crypto/aegis128-aesni-glue.c | 36 +++++++++++++++++++-------- 1 file changed, 25 insertions(+), 11 deletions(-)
arch/x86/crypto/aegis128-aesni-glue.c +25 -11
@@ -102,14 +102,16 @@ static void crypto_aegis128_aesni_process_ad(memset (buf.bytes + pos,0 ,AEGIS128_BLOCK_SIZE - pos);aegis128_aesni_ad (state, buf.bytes,AEGIS128_BLOCK_SIZE ); } } -static __always_inline void +static __always_inline intcrypto_aegis128_aesni_process_crypt (struct aegis_state *state,struct skcipher_walk *walk,bool enc) { +int err =0 ; +while (walk->nbytes >=AEGIS128_BLOCK_SIZE ) {if (enc) aegis128_aesni_enc(state, walk->src.virt.addr, walk->dst.virt.addr, round_down(walk->nbytes,
@@ -118,11 +120,12 @@ crypto_aegis128_aesni_process_crypt(struct aegis_state *state,aegis128_aesni_dec (state, walk->src.virt.addr, walk->dst.virt.addr,round_down (walk->nbytes,AEGIS128_BLOCK_SIZE ));kernel_fpu_end (); -skcipher_walk_done (walk, walk->nbytes %AEGIS128_BLOCK_SIZE ); + err =skcipher_walk_done (walk, + walk->nbytes %AEGIS128_BLOCK_SIZE );kernel_fpu_begin (); }if (walk->nbytes) {if (enc)
@@ -132,13 +135,14 @@ crypto_aegis128_aesni_process_crypt(struct aegis_state *state,else aegis128_aesni_dec_tail (state, walk->src.virt.addr, walk->dst.virt.addr, walk->nbytes);kernel_fpu_end (); -skcipher_walk_done (walk,0 ); + err =skcipher_walk_done (walk,0 );kernel_fpu_begin (); } +return err; }static struct aegis_ctx *crypto_aegis128_aesni_ctx (struct crypto_aead *aead) {u8 *ctx =crypto_aead_ctx (aead);
@@ -167,43 +171,50 @@ static int crypto_aegis128_aesni_setauthsize(struct crypto_aead *tfm,if (authsize <AEGIS128_MIN_AUTH_SIZE )return -EINVAL ;return 0 ; } -static __always_inline void +static __always_inline intcrypto_aegis128_aesni_crypt (struct aead_request *req,struct aegis_block *tag_xor,unsigned int cryptlen,bool enc) {struct crypto_aead *tfm =crypto_aead_reqtfm (req);struct aegis_ctx *ctx =crypto_aegis128_aesni_ctx (tfm);struct skcipher_walk walk;struct aegis_state state; +int err;if (enc) -skcipher_walk_aead_encrypt (&walk, req, false); + err =skcipher_walk_aead_encrypt (&walk, req, false);else -skcipher_walk_aead_decrypt (&walk, req, false); + err =skcipher_walk_aead_decrypt (&walk, req, false); +if (err) +return err;kernel_fpu_begin ();aegis128_aesni_init (&state, &ctx->key, req->iv);crypto_aegis128_aesni_process_ad (&state, req->src, req->assoclen); -crypto_aegis128_aesni_process_crypt (&state, &walk, enc); -aegis128_aesni_final (&state, tag_xor, req->assoclen, cryptlen); - + err =crypto_aegis128_aesni_process_crypt (&state, &walk, enc); +if (err ==0 ) +aegis128_aesni_final (&state, tag_xor, req->assoclen, cryptlen);kernel_fpu_end (); +return err; }static int crypto_aegis128_aesni_encrypt (struct aead_request *req) {struct crypto_aead *tfm =crypto_aead_reqtfm (req);struct aegis_block tag = {};unsigned int authsize =crypto_aead_authsize (tfm);unsigned int cryptlen = req->cryptlen; +int err; -crypto_aegis128_aesni_crypt (req, &tag, cryptlen, true); + err =crypto_aegis128_aesni_crypt (req, &tag, cryptlen, true); +if (err) +return err;scatterwalk_map_and_copy (tag.bytes, req->dst, req->assoclen + cryptlen, authsize,1 );return 0 ; }
@@ -214,15 +225,18 @@ static int crypto_aegis128_aesni_decrypt(struct aead_request *req)struct crypto_aead *tfm =crypto_aead_reqtfm (req);struct aegis_block tag;unsigned int authsize =crypto_aead_authsize (tfm);unsigned int cryptlen = req->cryptlen - authsize; +int err;scatterwalk_map_and_copy (tag.bytes, req->src, req->assoclen + cryptlen, authsize,0 ); -crypto_aegis128_aesni_crypt (req, &tag, cryptlen, false); + err =crypto_aegis128_aesni_crypt (req, &tag, cryptlen, false); +if (err) +return err;return crypto_memneq (tag.bytes, zeros.bytes, authsize) ? -EBADMSG :0 ; }static struct aead_alg crypto_aegis128_aesni_alg = {
Signature · 1 line
2.50.0
Herbert Xu
maintainerQuoted 7 lines · Eric Biggers
Since the legacy crypto API likes to randomly allocate memory, the x86 AEGIS code has some bugs. This series fixes them.
Eric Biggers (2):
crypto: x86/aegis - Fix sleeping when disallowed onPREEMPT_RT
crypto: x86/aegis - Add missing error checks
Quoted 5 lines
arch/x86/crypto/aegis128-aesni-glue.c| 40 +++++++++++++++++++--------1 file changed, 29 insertions(+), 11 deletions(-)base-commit:
181698af38d3f93381229ad89c09b5bd0496661a
All 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