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

Commit d3564338 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu
Browse files

crypto: serpent-sse2 - clear CRYPTO_TFM_REQ_MAY_SLEEP in lrw and xts modes 



LRW/XTS patches for serpent-sse2 forgot to add this. CRYPTO_TFM_REQ_MAY_SLEEP
should be cleared as sleeping between kernel_fpu_begin()/kernel_fpu_end() is
not allowed.

Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5962f8b6

arch/x86/crypto/serpent_sse2_glue.c

+4 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static int lrw_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, 
	};

	int ret;



	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

	ret = lrw_crypt(desc, dst, src, nbytes, &req);

	serpent_fpu_end(crypt_ctx.fpu_enabled);
@@ -579,6 +580,7 @@ static int lrw_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, 
	};

	int ret;



	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

	ret = lrw_crypt(desc, dst, src, nbytes, &req);

	serpent_fpu_end(crypt_ctx.fpu_enabled);
@@ -671,6 +673,7 @@ static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, 
	};

	int ret;



	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

	ret = xts_crypt(desc, dst, src, nbytes, &req);

	serpent_fpu_end(crypt_ctx.fpu_enabled);
@@ -697,6 +700,7 @@ static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, 
	};

	int ret;



	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

	ret = xts_crypt(desc, dst, src, nbytes, &req);

	serpent_fpu_end(crypt_ctx.fpu_enabled);