lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0225/1017] crypto: hisilicon/sec - fix the aead software fallback for engine
    Date
    From: Kai Ye <yekai13@huawei.com>

    [ Upstream commit 0a2a464f863187f97e96ebc6384c052cafd4a54c ]

    Due to the subreq pointer misuse the private context memory. The aead
    soft crypto occasionally casues the OS panic as setting the 64K page.
    Here is fix it.

    Fixes: 6c46a3297bea ("crypto: hisilicon/sec - add fallback tfm...")
    Signed-off-by: Kai Ye <yekai13@huawei.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/hisilicon/sec2/sec_crypto.c | 16 +++++++++++++---
    1 file changed, 13 insertions(+), 3 deletions(-)

    diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c
    index 6a45bd23b363..090920ed50c8 100644
    --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c
    +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c
    @@ -2284,9 +2284,10 @@ static int sec_aead_soft_crypto(struct sec_ctx *ctx,
    struct aead_request *aead_req,
    bool encrypt)
    {
    - struct aead_request *subreq = aead_request_ctx(aead_req);
    struct sec_auth_ctx *a_ctx = &ctx->a_ctx;
    struct device *dev = ctx->dev;
    + struct aead_request *subreq;
    + int ret;

    /* Kunpeng920 aead mode not support input 0 size */
    if (!a_ctx->fallback_aead_tfm) {
    @@ -2294,6 +2295,10 @@ static int sec_aead_soft_crypto(struct sec_ctx *ctx,
    return -EINVAL;
    }

    + subreq = aead_request_alloc(a_ctx->fallback_aead_tfm, GFP_KERNEL);
    + if (!subreq)
    + return -ENOMEM;
    +
    aead_request_set_tfm(subreq, a_ctx->fallback_aead_tfm);
    aead_request_set_callback(subreq, aead_req->base.flags,
    aead_req->base.complete, aead_req->base.data);
    @@ -2301,8 +2306,13 @@ static int sec_aead_soft_crypto(struct sec_ctx *ctx,
    aead_req->cryptlen, aead_req->iv);
    aead_request_set_ad(subreq, aead_req->assoclen);

    - return encrypt ? crypto_aead_encrypt(subreq) :
    - crypto_aead_decrypt(subreq);
    + if (encrypt)
    + ret = crypto_aead_encrypt(subreq);
    + else
    + ret = crypto_aead_decrypt(subreq);
    + aead_request_free(subreq);
    +
    + return ret;
    }

    static int sec_aead_crypto(struct aead_request *a_req, bool encrypt)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 13:51    [W:2.342 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site