This is a note to let you know that I've just added the patch titled
sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.
to the 3.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sparc64-set-crypto_tfm_req_may_sleep-consistently-in-camellia-code.patch
and it can be found in the queue-3.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 802a6fe1b7b7cf19450c29fb349017694f620776 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <[email protected]>
Date: Wed, 19 Dec 2012 15:44:31 -0800
Subject: sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.
From: "David S. Miller" <[email protected]>
[ Upstream commit 62ba63dc892cf836ecb9ce4fdb7644d45c95070b ]
We use the FPU and therefore cannot sleep during the crypto
loops.
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/sparc/crypto/camellia_glue.c | 3 +++
1 file changed, 3 insertions(+)
--- a/arch/sparc/crypto/camellia_glue.c
+++ b/arch/sparc/crypto/camellia_glue.c
@@ -98,6 +98,7 @@ static int __ecb_crypt(struct blkcipher_
blkcipher_walk_init(&walk, dst, src, nbytes);
err = blkcipher_walk_virt(desc, &walk);
+ desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
if (encrypt)
key = &ctx->encrypt_key[0];
@@ -160,6 +161,7 @@ static int cbc_encrypt(struct blkcipher_
blkcipher_walk_init(&walk, dst, src, nbytes);
err = blkcipher_walk_virt(desc, &walk);
+ desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
key = &ctx->encrypt_key[0];
camellia_sparc64_load_keys(key, ctx->key_len);
@@ -198,6 +200,7 @@ static int cbc_decrypt(struct blkcipher_
blkcipher_walk_init(&walk, dst, src, nbytes);
err = blkcipher_walk_virt(desc, &walk);
+ desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
key = &ctx->decrypt_key[0];
camellia_sparc64_load_keys(key, ctx->key_len);
Patches currently in stable-queue which might be from [email protected] are
queue-3.7/sparc64-set-crypto_tfm_req_may_sleep-consistently-in-des-code.patch
queue-3.7/sparc-huge_ptep_set_-functions-need-to-call-set_huge_pte_at.patch
queue-3.7/net-fix-a-race-in-gro_cell_poll.patch
queue-3.7/sparc64-fix-ecb-looping-constructs-in-aes-code.patch
queue-3.7/sparc64-fix-aes-ctr-mode-block-size.patch
queue-3.7/qmi_wwan-cdc_ether-add-dell-wireless-5800-novatel-e362-usb-ids.patch
queue-3.7/sparc64-set-crypto_tfm_req_may_sleep-consistently-in-aes-code.patch
queue-3.7/sparc64-fix-unrolled-aes-256-bit-key-loops.patch
queue-3.7/sparc64-set-crypto_tfm_req_may_sleep-consistently-in-camellia-code.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
