lkml.org 
[lkml]   [2020]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 172/232] crypto: ccree - dec auth tag size from cryptlen map
    Date
    From: Gilad Ben-Yossef <gilad@benyossef.com>

    commit 8962c6d2c2b8ca51b0f188109015b15fc5f4da44 upstream.

    Remove the auth tag size from cryptlen before mapping the destination
    in out-of-place AEAD decryption thus resolving a crash with
    extended testmgr tests.

    Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
    Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Cc: stable@vger.kernel.org # v4.19+
    Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/crypto/ccree/cc_buffer_mgr.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/drivers/crypto/ccree/cc_buffer_mgr.c
    +++ b/drivers/crypto/ccree/cc_buffer_mgr.c
    @@ -894,8 +894,12 @@ static int cc_aead_chain_data(struct cc_

    if (req->src != req->dst) {
    size_for_map = areq_ctx->assoclen + req->cryptlen;
    - size_for_map += (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ?
    - authsize : 0;
    +
    + if (direct == DRV_CRYPTO_DIRECTION_ENCRYPT)
    + size_for_map += authsize;
    + else
    + size_for_map -= authsize;
    +
    if (is_gcm4543)
    size_for_map += crypto_aead_ivsize(tfm);


    \
     
     \ /
      Last update: 2020-04-16 17:16    [W:4.023 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site