| From 92a73c650a6bdaabf5b0014796a196b593f173c9 Mon Sep 17 00:00:00 2001 |
| From: Eric Biggers <ebiggers@google.com> |
| Date: Mon, 30 Dec 2019 21:19:33 -0600 |
| Subject: [PATCH] crypto: atmel-sha - fix error handling when setting hmac key |
| |
| commit b529f1983b2dcc46354f311feda92e07b6e9e2da upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c |
| index c3599c3f1c5d..47c291cb2aa9 100644 |
| --- a/drivers/crypto/atmel-sha.c |
| +++ b/drivers/crypto/atmel-sha.c |
| @@ -1918,12 +1918,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.7.4 |
| |
