diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-11-05 18:30:46 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-21 09:49:21 +0100 |
| commit | 5e56be0e260cc367d2eb1823a9b476d018d80152 (patch) | |
| tree | c8b9d5e4b5ea30de8d8b1cfe373baacfeaab6be1 /crypto | |
| parent | 716b9ea8c6b07e293eb4af7cd68cbbb6c9490120 (diff) | |
| download | linux-stable-5e56be0e260cc367d2eb1823a9b476d018d80152.tar.gz linux-stable-5e56be0e260cc367d2eb1823a9b476d018d80152.tar.bz2 linux-stable-5e56be0e260cc367d2eb1823a9b476d018d80152.zip | |
crypto: dh - Don't permit 'key' or 'g' size longer than 'p'
commit ccd9888f14a8019c0bbdeeae758aba1f58693712 upstream.
The "qat-dh" DH implementation assumes that 'key' and 'g' can be copied
into a buffer with size 'p_size'. However it was never checked that
that was actually the case, which most likely allowed users to cause a
buffer underflow via KEYCTL_DH_COMPUTE.
Fix this by updating crypto_dh_decode_key() to verify this precondition
for all DH implementations.
Fixes: c9839143ebbf ("crypto: qat - Add DH support")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/dh_helper.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crypto/dh_helper.c b/crypto/dh_helper.c index 708ae20d2d3c..7f00c771fe8d 100644 --- a/crypto/dh_helper.c +++ b/crypto/dh_helper.c @@ -83,6 +83,14 @@ int crypto_dh_decode_key(const char *buf, unsigned int len, struct dh *params) if (secret.len != crypto_dh_key_len(params)) return -EINVAL; + /* + * Don't permit the buffer for 'key' or 'g' to be larger than 'p', since + * some drivers assume otherwise. + */ + if (params->key_size > params->p_size || + params->g_size > params->p_size) + return -EINVAL; + /* Don't allocate memory. Set pointers to data within * the given buffer */ |