diff options
author | Daniele Alessandrelli <daniele.alessandrelli@intel.com> | 2021-02-03 11:28:37 +0000 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2021-02-10 17:55:57 +1100 |
commit | 49397f15495d5f06d87da962adab714720026232 (patch) | |
tree | 2c898b612adbb5aa22f51a4fcca332152cc78571 | |
parent | e78fa53b027e14a0c7581f5e6e4fdd096954d5b1 (diff) | |
download | linux-crypto-49397f15495d5f06d87da962adab714720026232.tar.gz linux-crypto-49397f15495d5f06d87da962adab714720026232.zip |
crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key()
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>
Diffstat (limited to '')
-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)) |