lkml.org 
[lkml]   [2016]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 067/118] crypto: cryptd - initialize child shash_desc on import
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

    commit 0bd2223594a4dcddc1e34b15774a3a4776f7749e upstream.

    When calling .import() on a cryptd ahash_request, the structure members
    that describe the child transform in the shash_desc need to be initialized
    like they are when calling .init()

    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    crypto/cryptd.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/crypto/cryptd.c
    +++ b/crypto/cryptd.c
    @@ -594,9 +594,14 @@ static int cryptd_hash_export(struct aha

    static int cryptd_hash_import(struct ahash_request *req, const void *in)
    {
    - struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
    + struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
    + struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(tfm);
    + struct shash_desc *desc = cryptd_shash_desc(req);

    - return crypto_shash_import(&rctx->desc, in);
    + desc->tfm = ctx->child;
    + desc->flags = req->base.flags;
    +
    + return crypto_shash_import(desc, in);
    }

    static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,

    \
     
     \ /
      Last update: 2016-09-23 00:04    [W:4.181 / U:0.604 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site