* [PATCH] crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key()
@ 2021-02-03 11:28 Daniele Alessandrelli
2021-02-10 7:22 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: Daniele Alessandrelli @ 2021-02-03 11:28 UTC (permalink / raw)
To: herbert; +Cc: daniele.alessandrelli, linux-crypto, linux-kernel
From: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
The length ('len' parameter) passed to crypto_ecdh_decode_key() is never
checked against the length encoded in the passed buffer ('buf'
parameter). This could lead to an out-of-bounds access when the passed
length is less than the encoded length.
Add a check to prevent that.
Signed-off-by: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
---
crypto/ecdh_helper.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/crypto/ecdh_helper.c b/crypto/ecdh_helper.c
index 66fcb2ea8154..fca63b559f65 100644
--- a/crypto/ecdh_helper.c
+++ b/crypto/ecdh_helper.c
@@ -67,6 +67,9 @@ int crypto_ecdh_decode_key(const char *buf, unsigned int len,
if (secret.type != CRYPTO_KPP_SECRET_TYPE_ECDH)
return -EINVAL;
+ if (unlikely(len < secret.len))
+ return -EINVAL;
+
ptr = ecdh_unpack_data(¶ms->curve_id, ptr, sizeof(params->curve_id));
ptr = ecdh_unpack_data(¶ms->key_size, ptr, sizeof(params->key_size));
if (secret.len != crypto_ecdh_key_len(params))
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key()
2021-02-03 11:28 [PATCH] crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key() Daniele Alessandrelli
@ 2021-02-10 7:22 ` Herbert Xu
0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2021-02-10 7:22 UTC (permalink / raw)
To: Daniele Alessandrelli; +Cc: daniele.alessandrelli, linux-crypto, linux-kernel
On Wed, Feb 03, 2021 at 11:28:37AM +0000, Daniele Alessandrelli wrote:
> From: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
>
> The length ('len' parameter) passed to crypto_ecdh_decode_key() is never
> checked against the length encoded in the passed buffer ('buf'
> parameter). This could lead to an out-of-bounds access when the passed
> length is less than the encoded length.
>
> Add a check to prevent that.
>
> Signed-off-by: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
> ---
> crypto/ecdh_helper.c | 3 +++
> 1 file changed, 3 insertions(+)
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-10 7:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-03 11:28 [PATCH] crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key() Daniele Alessandrelli
2021-02-10 7:22 ` Herbert Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.