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: Jussi Kivilinna <jussi.kivili...@mbnet.fi>
---
 arch/x86/crypto/serpent_sse2_glue.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/x86/crypto/serpent_sse2_glue.c 
b/arch/x86/crypto/serpent_sse2_glue.c
index 8e214db..611c3c8 100644
--- a/arch/x86/crypto/serpent_sse2_glue.c
+++ b/arch/x86/crypto/serpent_sse2_glue.c
@@ -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);
 

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to