lkml.org 
[lkml]   [2018]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 58/72] crypto: x86/cast5-avx - fix ECB encryption when long sg follows short one
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Biggers <ebiggers@google.com>

    commit 8f461b1e02ed546fbd0f11611138da67fd85a30f upstream.

    With ecb-cast5-avx, if a 128+ byte scatterlist element followed a
    shorter one, then the algorithm accidentally encrypted/decrypted only 8
    bytes instead of the expected 128 bytes. Fix it by setting the
    encryption/decryption 'fn' correctly.

    Fixes: c12ab20b162c ("crypto: cast5/avx - avoid using temporary stack buffers")
    Cc: <stable@vger.kernel.org> # v3.8+
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/crypto/cast5_avx_glue.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/arch/x86/crypto/cast5_avx_glue.c
    +++ b/arch/x86/crypto/cast5_avx_glue.c
    @@ -66,8 +66,6 @@ static int ecb_crypt(struct blkcipher_de
    void (*fn)(struct cast5_ctx *ctx, u8 *dst, const u8 *src);
    int err;

    - fn = (enc) ? cast5_ecb_enc_16way : cast5_ecb_dec_16way;
    -
    err = blkcipher_walk_virt(desc, walk);
    desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;

    @@ -79,6 +77,7 @@ static int ecb_crypt(struct blkcipher_de

    /* Process multi-block batch */
    if (nbytes >= bsize * CAST5_PARALLEL_BLOCKS) {
    + fn = (enc) ? cast5_ecb_enc_16way : cast5_ecb_dec_16way;
    do {
    fn(ctx, wdst, wsrc);


    \
     
     \ /
      Last update: 2018-04-06 15:54    [W:4.153 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site