Commit a53ab94e authored by Daniele Alessandrelli's avatar Daniele Alessandrelli Committed by Herbert Xu
Browse files

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: 3c4b2390 ("crypto: ecdh - Add ECDH software support")
Signed-off-by: default avatarDaniele Alessandrelli <daniele.alessandrelli@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 578f23d3

crypto/ecdh_helper.c

+3 −0
Original line number Diff line number Diff line
@@ -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))