Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7ac7690 authored by Roel Kluin's avatar Roel Kluin Committed by Herbert Xu
Browse files

crypto: aes_s390 - access .cip instead of .blk in cipher mode 



The fallback code in cipher mode touch the union fallback.blk instead
of fallback.cip. This is wrong because we use the cipher and not the
blockcipher. This did not show any side effects yet because both types /
structs contain the same element right now.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5068c7a8

arch/s390/crypto/aes_s390.c

+3 −3
Original line number Diff line number Diff line
@@ -78,14 +78,14 @@ static int setkey_fallback_cip(struct crypto_tfm *tfm, const u8 *in_key, 
	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);

	int ret;



	sctx->fallback.blk->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;

	sctx->fallback.blk->base.crt_flags |= (tfm->crt_flags &

	sctx->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;

	sctx->fallback.cip->base.crt_flags |= (tfm->crt_flags &

			CRYPTO_TFM_REQ_MASK);



	ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len);

	if (ret) {

		tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;

		tfm->crt_flags |= (sctx->fallback.blk->base.crt_flags &

		tfm->crt_flags |= (sctx->fallback.cip->base.crt_flags &

				CRYPTO_TFM_RES_MASK);

	}

	return ret;