lkml.org 
[lkml]   [2014]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 06/12] crypto: LLVMLinux: Remove VLAIS from crypto/omap_sham.c
    Date
    From: Behan Webster <behanw@converseincode.com>

    Replaced the use of a Variable Length Array In Struct (VLAIS) with a C99
    compliant equivalent. This patch allocates the appropriate amount of memory
    using a char array using the SHASH_DESC_ON_STACK macro.

    The new code can be compiled with both gcc and clang.

    Signed-off-by: Behan Webster <behanw@converseincode.com>
    Reviewed-by: Mark Charlebois <charlebm@gmail.com>
    Reviewed-by: Jan-Simon Möller <dl9pf@gmx.de>
    ---
    drivers/crypto/omap-sham.c | 28 +++++++++++-----------------
    1 file changed, 11 insertions(+), 17 deletions(-)

    diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
    index 710d863..24ef489 100644
    --- a/drivers/crypto/omap-sham.c
    +++ b/drivers/crypto/omap-sham.c
    @@ -949,17 +949,14 @@ static int omap_sham_finish_hmac(struct ahash_request *req)
    struct omap_sham_hmac_ctx *bctx = tctx->base;
    int bs = crypto_shash_blocksize(bctx->shash);
    int ds = crypto_shash_digestsize(bctx->shash);
    - struct {
    - struct shash_desc shash;
    - char ctx[crypto_shash_descsize(bctx->shash)];
    - } desc;
    + SHASH_DESC_ON_STACK(shash, bctx->shash);

    - desc.shash.tfm = bctx->shash;
    - desc.shash.flags = 0; /* not CRYPTO_TFM_REQ_MAY_SLEEP */
    + shash->tfm = bctx->shash;
    + shash->flags = 0; /* not CRYPTO_TFM_REQ_MAY_SLEEP */

    - return crypto_shash_init(&desc.shash) ?:
    - crypto_shash_update(&desc.shash, bctx->opad, bs) ?:
    - crypto_shash_finup(&desc.shash, req->result, ds, req->result);
    + return crypto_shash_init(shash) ?:
    + crypto_shash_update(shash, bctx->opad, bs) ?:
    + crypto_shash_finup(shash, req->result, ds, req->result);
    }

    static int omap_sham_finish(struct ahash_request *req)
    @@ -1118,18 +1115,15 @@ static int omap_sham_update(struct ahash_request *req)
    return omap_sham_enqueue(req, OP_UPDATE);
    }

    -static int omap_sham_shash_digest(struct crypto_shash *shash, u32 flags,
    +static int omap_sham_shash_digest(struct crypto_shash *tfm, u32 flags,
    const u8 *data, unsigned int len, u8 *out)
    {
    - struct {
    - struct shash_desc shash;
    - char ctx[crypto_shash_descsize(shash)];
    - } desc;
    + SHASH_DESC_ON_STACK(shash, tfm);

    - desc.shash.tfm = shash;
    - desc.shash.flags = flags & CRYPTO_TFM_REQ_MAY_SLEEP;
    + shash->tfm = tfm;
    + shash->flags = flags & CRYPTO_TFM_REQ_MAY_SLEEP;

    - return crypto_shash_digest(&desc.shash, data, len, out);
    + return crypto_shash_digest(shash, data, len, out);
    }

    static int omap_sham_final_shash(struct ahash_request *req)
    --
    1.9.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-09-15 10:01    [W:4.293 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site