diff options
| author | Daniele Alessandrelli <daniele.alessandrelli@intel.com> | 2021-02-03 12:28:37 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2021-02-10 07:55:57 +0100 |
| commit | a53ab94eb6850c3657392e2d2ce9b38c387a2633 (patch) | |
| tree | e05ad36230e3cc051a515e3773c95a172f29a0a2 /crypto/ecdh_helper.c | |
| parent | crypto: powerpc/sha256 - remove unneeded semicolon (diff) | |
| download | linux-a53ab94eb6850c3657392e2d2ce9b38c387a2633.tar.xz linux-a53ab94eb6850c3657392e2d2ce9b38c387a2633.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: 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>
Diffstat (limited to 'crypto/ecdh_helper.c')
| -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 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)) |