]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
crypto: artpec6 - return correct error code for failed setkey()
authorEric Biggers <ebiggers@google.com>
Tue, 31 Dec 2019 03:19:32 +0000 (21:19 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Feb 2020 21:33:27 +0000 (16:33 -0500)
commit b828f905904cd76424230c69741a4cabb0174168 upstream.

->setkey() is supposed to retun -EINVAL for invalid key lengths, not -1.

Fixes: a21eb94fc4d3 ("crypto: axis - add ARTPEC-6/7 crypto accelerator driver")
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Lars Persson <lars.persson@axis.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Lars Persson <lars.persson@axis.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/crypto/axis/artpec6_crypto.c

index fdcdc751d03bdd400457ee39493a5c349a8bc81b..3caf57ebdbff570907d27dea3bdb41d5dc44ce1e 100644 (file)
@@ -1256,7 +1256,7 @@ static int artpec6_crypto_aead_set_key(struct crypto_aead *tfm, const u8 *key,
 
        if (len != 16 && len != 24 && len != 32) {
                crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
-               return -1;
+               return -EINVAL;
        }
 
        ctx->key_length = len;