lkml.org 
[lkml]   [2010]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[33/34] crypto: authenc - Add EINPROGRESS check
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Herbert Xu <herbert@gondor.apana.org.au>

    commit 180ce7e81030e1ef763d58f97f9ab840ff57d848 upstream.

    When Steffen originally wrote the authenc async hash patch, he
    correctly had EINPROGRESS checks in place so that we did not invoke
    the original completion handler with it.

    Unfortuantely I told him to remove it before the patch was applied.

    As only MAY_BACKLOG request completion handlers are required to
    handle EINPROGRESS completions, those checks are really needed.

    This patch restores them.

    Reported-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    crypto/authenc.c | 16 +++++++++++-----
    1 file changed, 11 insertions(+), 5 deletions(-)
    --- a/crypto/authenc.c
    +++ b/crypto/authenc.c
    @@ -46,6 +46,12 @@ struct authenc_request_ctx {
    char tail[];
    };

    +static void authenc_request_complete(struct aead_request *req, int err)
    +{
    + if (err != -EINPROGRESS)
    + aead_request_complete(req, err);
    +}
    +
    static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,
    unsigned int keylen)
    {
    @@ -142,7 +148,7 @@ static void authenc_geniv_ahash_update_d
    crypto_aead_authsize(authenc), 1);

    out:
    - aead_request_complete(req, err);
    + authenc_request_complete(req, err);
    }

    static void authenc_geniv_ahash_done(struct crypto_async_request *areq, int err)
    @@ -208,7 +214,7 @@ static void authenc_verify_ahash_update_
    err = crypto_ablkcipher_decrypt(abreq);

    out:
    - aead_request_complete(req, err);
    + authenc_request_complete(req, err);
    }

    static void authenc_verify_ahash_done(struct crypto_async_request *areq,
    @@ -245,7 +251,7 @@ static void authenc_verify_ahash_done(st
    err = crypto_ablkcipher_decrypt(abreq);

    out:
    - aead_request_complete(req, err);
    + authenc_request_complete(req, err);
    }

    static u8 *crypto_authenc_ahash_fb(struct aead_request *req, unsigned int flags)
    @@ -379,7 +385,7 @@ static void crypto_authenc_encrypt_done(
    err = crypto_authenc_genicv(areq, iv, 0);
    }

    - aead_request_complete(areq, err);
    + authenc_request_complete(areq, err);
    }

    static int crypto_authenc_encrypt(struct aead_request *req)
    @@ -418,7 +424,7 @@ static void crypto_authenc_givencrypt_do
    err = crypto_authenc_genicv(areq, greq->giv, 0);
    }

    - aead_request_complete(areq, err);
    + authenc_request_complete(areq, err);
    }

    static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)



    \
     
     \ /
      Last update: 2010-05-25 01:13    [from the cache]
    ©2003-2011 Jasper Spaans