mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
crypto: atmel-ecc - avoid stale fallback key after set_secret failure
Clear ->do_fallback before decoding a new ECDH secret and enable it only
after the software fallback accepts a caller-provided private key. This
avoids using a stale fallback key should crypto_kpp_set_secret() fail.
Fixes: 11105693fa ("crypto: atmel-ecc - introduce Microchip / Atmel ECC driver")
Cc: stable@vger.kernel.org
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
committed by
Herbert Xu
parent
21d04ac27e
commit
f07a0d251d
@@ -82,6 +82,7 @@ static int atmel_ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
|
||||
|
||||
kfree(ctx->public_key);
|
||||
ctx->public_key = NULL;
|
||||
ctx->do_fallback = false;
|
||||
|
||||
if (crypto_ecdh_decode_key(buf, len, ¶ms) < 0) {
|
||||
dev_err(&ctx->client->dev, "crypto_ecdh_decode_key failed\n");
|
||||
@@ -89,8 +90,9 @@ static int atmel_ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
|
||||
}
|
||||
|
||||
if (params.key_size) {
|
||||
ctx->do_fallback = true;
|
||||
return crypto_kpp_set_secret(ctx->fallback, buf, len);
|
||||
ret = crypto_kpp_set_secret(ctx->fallback, buf, len);
|
||||
ctx->do_fallback = !ret;
|
||||
return ret;
|
||||
}
|
||||
|
||||
cmd = kmalloc_obj(*cmd);
|
||||
@@ -101,8 +103,6 @@ static int atmel_ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
|
||||
if (!public_key)
|
||||
goto free_cmd;
|
||||
|
||||
ctx->do_fallback = false;
|
||||
|
||||
atmel_i2c_init_genkey_cmd(cmd, DATA_SLOT_2);
|
||||
|
||||
ret = atmel_i2c_send_receive(ctx->client, cmd);
|
||||
|
||||
Reference in New Issue
Block a user