]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.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)
committerPaolo Pisati <paolo.pisati@canonical.com>
Mon, 17 Feb 2020 11:37:06 +0000 (12:37 +0100)
BugLink: https://bugs.launchpad.net/bugs/1863589
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>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/crypto/axis/artpec6_crypto.c

index 4b20606983a43c7fe59bf0119e2d458594d619bb..22ebe40f09f53dc5ec53f6078de2b31adf5ce42e 100644 (file)
@@ -1251,7 +1251,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;