Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0682e027 authored by Horia Geantă's avatar Horia Geantă Committed by Greg Kroah-Hartman
Browse files

crypto: caam/qi - fix error path in xts setkey 



commit ad876a18048f43b1f66f5d474b7598538668c5de upstream.

xts setkey callback returns 0 on some error paths.
Fix this by returning -EINVAL.

Cc: <stable@vger.kernel.org> # 4.12+
Fixes: b189817c ("crypto: caam/qi - add ablkcipher and authenc algorithms")
Signed-off-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ccb38942

drivers/crypto/caam/caamalg_qi.c

+2 −4
Original line number Diff line number Diff line
@@ -350,10 +350,8 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 
	int ret = 0;



	if (keylen != 2 * AES_MIN_KEY_SIZE  && keylen != 2 * AES_MAX_KEY_SIZE) {

		crypto_ablkcipher_set_flags(ablkcipher,

					    CRYPTO_TFM_RES_BAD_KEY_LEN);

		dev_err(jrdev, "key size mismatch\n");

		return -EINVAL;

		goto badkey;

	}



	memcpy(ctx->key, key, keylen);
@@ -388,7 +386,7 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 
	return ret;

badkey:

	crypto_ablkcipher_set_flags(ablkcipher, CRYPTO_TFM_RES_BAD_KEY_LEN);

	return 0;

	return -EINVAL;

}



/*