Merge tag 'mfd-next-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[linux.git] / drivers / crypto / caam / caamalg.c

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 2912006b946b018f13af84322342633cd4284ff7..ef1a65f4fc92048a0cb961b6777d26f02e942e17 100644 (file)
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -548,10 +548,8 @@ static int chachapoly_setkey(struct crypto_aead *aead, const u8 *key,
        unsigned int ivsize = crypto_aead_ivsize(aead);
        unsigned int saltlen = CHACHAPOLY_IV_SIZE - ivsize;
 
-       if (keylen != CHACHA_KEY_SIZE + saltlen) {
-               crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);
+       if (keylen != CHACHA_KEY_SIZE + saltlen)
                return -EINVAL;
-       }
 
        ctx->cdata.key_virt = key;
        ctx->cdata.keylen = keylen - saltlen;
@@ -619,7 +617,6 @@ static int aead_setkey(struct crypto_aead *aead,
        memzero_explicit(&keys, sizeof(keys));
        return aead_set_sh_desc(aead);
 badkey:
-       crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);
        memzero_explicit(&keys, sizeof(keys));
        return -EINVAL;
 }
@@ -649,10 +646,8 @@ static int gcm_setkey(struct crypto_aead *aead,
        int err;
 
        err = aes_check_keylen(keylen);
-       if (err) {
-               crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);
+       if (err)
                return err;
-       }
 
        print_hex_dump_debug("key in @"__stringify(__LINE__)": ",
                             DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);
@@ -672,10 +667,8 @@ static int rfc4106_setkey(struct crypto_aead *aead,
        int err;
 
        err = aes_check_keylen(keylen - 4);
-       if (err) {
-               crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);
+       if (err)
                return err;
-       }
 
        print_hex_dump_debug("key in @"__stringify(__LINE__)": ",
                             DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);
@@ -700,10 +693,8 @@ static int rfc4543_setkey(struct crypto_aead *aead,
        int err;
 
        err = aes_check_keylen(keylen - 4);
-       if (err) {
-               crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);
+       if (err)
                return err;
-       }
 
        print_hex_dump_debug("key in @"__stringify(__LINE__)": ",
                             DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);
@@ -762,11 +753,8 @@ static int aes_skcipher_setkey(struct crypto_skcipher *skcipher,
        int err;
 
        err = aes_check_keylen(keylen);
-       if (err) {
-               crypto_skcipher_set_flags(skcipher,
-                                         CRYPTO_TFM_RES_BAD_KEY_LEN);
+       if (err)
                return err;
-       }
 
        return skcipher_setkey(skcipher, key, keylen, 0);
 }
@@ -786,11 +774,8 @@ static int rfc3686_skcipher_setkey(struct crypto_skcipher *skcipher,
        keylen -= CTR_RFC3686_NONCE_SIZE;
 
        err = aes_check_keylen(keylen);
-       if (err) {
-               crypto_skcipher_set_flags(skcipher,
-                                         CRYPTO_TFM_RES_BAD_KEY_LEN);
+       if (err)
                return err;
-       }
 
        return skcipher_setkey(skcipher, key, keylen, ctx1_iv_off);
 }
@@ -809,11 +794,8 @@ static int ctr_skcipher_setkey(struct crypto_skcipher *skcipher,
        ctx1_iv_off = 16;
 
        err = aes_check_keylen(keylen);
-       if (err) {
-               crypto_skcipher_set_flags(skcipher,
-                                         CRYPTO_TFM_RES_BAD_KEY_LEN);
+       if (err)
                return err;
-       }
 
        return skcipher_setkey(skcipher, key, keylen, ctx1_iv_off);
 }
@@ -846,7 +828,6 @@ static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,
        u32 *desc;
 
        if (keylen != 2 * AES_MIN_KEY_SIZE  && keylen != 2 * AES_MAX_KEY_SIZE) {
-               crypto_skcipher_set_flags(skcipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
                dev_err(jrdev, "key size mismatch\n");
                return -EINVAL;
        }