diff options
| author | Daniele Alessandrelli <daniele.alessandrelli@intel.com> | 2021-02-03 11:28:37 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-04 10:26:25 +0100 |
| commit | 27d3234d07268f255a3e99cde5d4bd54d54da8a9 (patch) | |
| tree | ed36dd8a358c492c377bfd64f0f467f3367b3132 | |
| parent | 201d252bae349ab468d9c50ebfeba3e08f98e05f (diff) | |
| download | linux-crypto-27d3234d07268f255a3e99cde5d4bd54d54da8a9.tar.gz linux-crypto-27d3234d07268f255a3e99cde5d4bd54d54da8a9.zip | |
crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key()
[ Upstream commit 49397f15495d5f06d87da962adab714720026232 ]
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: e8c7f30611313 ("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>
| -rw-r--r-- | crypto/ecdh_helper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/ecdh_helper.c b/crypto/ecdh_helper.c index 66fcb2ea..fca63b55 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)) |