lkml.org 
[lkml]   [2013]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 080/123] sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in AES code.
    Date
    3.7-stable review patch.  If anyone has any objections, please let me know.

    ------------------


    From: "David S. Miller" <davem@davemloft.net>

    [ Upstream commit b35d282ef7345320b594d48d8d70caedfa962a01 ]

    We use the FPU and therefore cannot sleep during the crypto
    loops.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/sparc/crypto/aes_glue.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/arch/sparc/crypto/aes_glue.c
    +++ b/arch/sparc/crypto/aes_glue.c
    @@ -222,6 +222,7 @@ static int ecb_encrypt(struct blkcipher_

    blkcipher_walk_init(&walk, dst, src, nbytes);
    err = blkcipher_walk_virt(desc, &walk);
    + desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

    ctx->ops->load_encrypt_keys(&ctx->key[0]);
    while ((nbytes = walk.nbytes)) {
    @@ -251,6 +252,7 @@ static int ecb_decrypt(struct blkcipher_

    blkcipher_walk_init(&walk, dst, src, nbytes);
    err = blkcipher_walk_virt(desc, &walk);
    + desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

    ctx->ops->load_decrypt_keys(&ctx->key[0]);
    key_end = &ctx->key[ctx->expanded_key_length / sizeof(u64)];
    @@ -280,6 +282,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;

    ctx->ops->load_encrypt_keys(&ctx->key[0]);
    while ((nbytes = walk.nbytes)) {
    @@ -309,6 +312,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;

    ctx->ops->load_decrypt_keys(&ctx->key[0]);
    key_end = &ctx->key[ctx->expanded_key_length / sizeof(u64)];



    \
     
     \ /
      Last update: 2013-01-09 23:21    [W:3.074 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site