lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 139/252] crypto: atmel-sha - fix error handling when setting hmac key
    Date
    From: Eric Biggers <ebiggers@google.com>

    [ Upstream commit b529f1983b2dcc46354f311feda92e07b6e9e2da ]

    HMAC keys can be of any length, and atmel_sha_hmac_key_set() can only
    fail due to -ENOMEM. But atmel_sha_hmac_setkey() incorrectly treated
    any error as a "bad key length" error. Fix it to correctly propagate
    the -ENOMEM error code and not set any tfm result flags.

    Fixes: 81d8750b2b59 ("crypto: atmel-sha - add support to hmac(shaX)")
    Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
    Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/atmel-sha.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c
    index ef125d4be8fc4..cb548a0506c54 100644
    --- a/drivers/crypto/atmel-sha.c
    +++ b/drivers/crypto/atmel-sha.c
    @@ -1921,12 +1921,7 @@ static int atmel_sha_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,
    {
    struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);

    - if (atmel_sha_hmac_key_set(&hmac->hkey, key, keylen)) {
    - crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
    - return -EINVAL;
    - }
    -
    - return 0;
    + return atmel_sha_hmac_key_set(&hmac->hkey, key, keylen);
    }

    static int atmel_sha_hmac_init(struct ahash_request *req)
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 18:07    [W:4.142 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site