lkml.org 
[lkml]   [2014]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 04/40] crypto: s390 - fix des and des3_ede cbc concurrency issue
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

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

    From: Harald Freudenberger <freude@linux.vnet.ibm.com>

    commit adc3fcf1552b6e406d172fd9690bbd1395053d13 upstream.

    In s390 des and des3_ede cbc mode the iv value is not protected
    against concurrency access and modifications from another running
    en/decrypt operation which is using the very same tfm struct
    instance. This fix copies the iv to the local stack before
    the crypto operation and stores the value back when done.

    Signed-off-by: Harald Freudenberger <freude@linux.vnet.ibm.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/s390/crypto/des_s390.c | 26 ++++++++++++++------------
    1 file changed, 14 insertions(+), 12 deletions(-)

    --- a/arch/s390/crypto/des_s390.c
    +++ b/arch/s390/crypto/des_s390.c
    @@ -105,29 +105,35 @@ static int ecb_desall_crypt(struct blkci
    }

    static int cbc_desall_crypt(struct blkcipher_desc *desc, long func,
    - u8 *iv, struct blkcipher_walk *walk)
    + struct blkcipher_walk *walk)
    {
    + struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
    int ret = blkcipher_walk_virt(desc, walk);
    unsigned int nbytes = walk->nbytes;
    + struct {
    + u8 iv[DES_BLOCK_SIZE];
    + u8 key[DES3_KEY_SIZE];
    + } param;

    if (!nbytes)
    goto out;

    - memcpy(iv, walk->iv, DES_BLOCK_SIZE);
    + memcpy(param.iv, walk->iv, DES_BLOCK_SIZE);
    + memcpy(param.key, ctx->key, DES3_KEY_SIZE);
    do {
    /* only use complete blocks */
    unsigned int n = nbytes & ~(DES_BLOCK_SIZE - 1);
    u8 *out = walk->dst.virt.addr;
    u8 *in = walk->src.virt.addr;

    - ret = crypt_s390_kmc(func, iv, out, in, n);
    + ret = crypt_s390_kmc(func, &param, out, in, n);
    if (ret < 0 || ret != n)
    return -EIO;

    nbytes &= DES_BLOCK_SIZE - 1;
    ret = blkcipher_walk_done(desc, walk, nbytes);
    } while ((nbytes = walk->nbytes));
    - memcpy(walk->iv, iv, DES_BLOCK_SIZE);
    + memcpy(walk->iv, param.iv, DES_BLOCK_SIZE);

    out:
    return ret;
    @@ -179,22 +185,20 @@ static int cbc_des_encrypt(struct blkcip
    struct scatterlist *dst, struct scatterlist *src,
    unsigned int nbytes)
    {
    - struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
    struct blkcipher_walk walk;

    blkcipher_walk_init(&walk, dst, src, nbytes);
    - return cbc_desall_crypt(desc, KMC_DEA_ENCRYPT, ctx->iv, &walk);
    + return cbc_desall_crypt(desc, KMC_DEA_ENCRYPT, &walk);
    }

    static int cbc_des_decrypt(struct blkcipher_desc *desc,
    struct scatterlist *dst, struct scatterlist *src,
    unsigned int nbytes)
    {
    - struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
    struct blkcipher_walk walk;

    blkcipher_walk_init(&walk, dst, src, nbytes);
    - return cbc_desall_crypt(desc, KMC_DEA_DECRYPT, ctx->iv, &walk);
    + return cbc_desall_crypt(desc, KMC_DEA_DECRYPT, &walk);
    }

    static struct crypto_alg cbc_des_alg = {
    @@ -327,22 +331,20 @@ static int cbc_des3_encrypt(struct blkci
    struct scatterlist *dst, struct scatterlist *src,
    unsigned int nbytes)
    {
    - struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
    struct blkcipher_walk walk;

    blkcipher_walk_init(&walk, dst, src, nbytes);
    - return cbc_desall_crypt(desc, KMC_TDEA_192_ENCRYPT, ctx->iv, &walk);
    + return cbc_desall_crypt(desc, KMC_TDEA_192_ENCRYPT, &walk);
    }

    static int cbc_des3_decrypt(struct blkcipher_desc *desc,
    struct scatterlist *dst, struct scatterlist *src,
    unsigned int nbytes)
    {
    - struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
    struct blkcipher_walk walk;

    blkcipher_walk_init(&walk, dst, src, nbytes);
    - return cbc_desall_crypt(desc, KMC_TDEA_192_DECRYPT, ctx->iv, &walk);
    + return cbc_desall_crypt(desc, KMC_TDEA_192_DECRYPT, &walk);
    }

    static struct crypto_alg cbc_des3_alg = {



    \
     
     \ /
      Last update: 2014-02-19 00:41    [W:8.787 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site