summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDaniele Alessandrelli <daniele.alessandrelli@intel.com>2021-02-03 11:28:37 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-04 11:37:49 +0100
commitea914be6de9d5b4502e063cdf1b1036f35206bcf (patch)
tree5f97f7dd440b0ad08fe6dd84c9a1c1a4eb1e589a /crypto
parentbebfe70c4df87809a1d46db12130f1886c05518f (diff)
downloadlinux-stable-ea914be6de9d5b4502e063cdf1b1036f35206bcf.tar.gz
linux-stable-ea914be6de9d5b4502e063cdf1b1036f35206bcf.tar.bz2
linux-stable-ea914be6de9d5b4502e063cdf1b1036f35206bcf.zip
crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key()
[ Upstream commit a53ab94eb6850c3657392e2d2ce9b38c387a2633 ] 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. Fixes: 3c4b23901a0c7 ("crypto: ecdh - Add ECDH software support") Signed-off-by: Daniele Alessandrelli <daniele.alessandrelli@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/ecdh_helper.c3
1 files changed, 3 insertions, 0 deletions
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(&params->curve_id, ptr, sizeof(params->curve_id));
ptr = ecdh_unpack_data(&params->key_size, ptr, sizeof(params->key_size));
if (secret.len != crypto_ecdh_key_len(params))