diff options
| author | Kees Cook <keescook@chromium.org> | 2018-03-30 09:55:44 -0700 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-04-21 00:58:29 +0800 |
| commit | d5c3b17898993c3461fb3f0497f45098ffd72ac6 (patch) | |
| tree | 8918812280a8d42919dd3cef54dc22aa80cc4bc1 /crypto/ecdh.c | |
| parent | 3a488aaec6f343b5dc6d94529847a840bbeaf009 (diff) | |
| download | linux-d5c3b17898993c3461fb3f0497f45098ffd72ac6.tar.gz linux-d5c3b17898993c3461fb3f0497f45098ffd72ac6.tar.bz2 linux-d5c3b17898993c3461fb3f0497f45098ffd72ac6.zip | |
crypto: ecc - Actually remove stack VLA usage
On the quest to remove all VLAs from the kernel[1], this avoids VLAs
by just using the maximum allocation size (4 bytes) for stack arrays.
All the VLAs in ecc were either 3 or 4 bytes (or a multiple), so just
make it 4 bytes all the time. Initialization routines are adjusted to
check that ndigits does not end up larger than the arrays.
This includes a removal of the earlier attempt at this fix from
commit a963834b4742 ("crypto/ecc: Remove stack VLA usage")
[1] https://lkml.org/lkml/2018/3/7/621
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/ecdh.c')
| -rw-r--r-- | crypto/ecdh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/ecdh.c b/crypto/ecdh.c index d2ec33f0e098..bf6300175b9c 100644 --- a/crypto/ecdh.c +++ b/crypto/ecdh.c @@ -30,8 +30,8 @@ static inline struct ecdh_ctx *ecdh_get_ctx(struct crypto_kpp *tfm) static unsigned int ecdh_supported_curve(unsigned int curve_id) { switch (curve_id) { - case ECC_CURVE_NIST_P192: return 3; - case ECC_CURVE_NIST_P256: return 4; + case ECC_CURVE_NIST_P192: return ECC_CURVE_NIST_P192_DIGITS; + case ECC_CURVE_NIST_P256: return ECC_CURVE_NIST_P256_DIGITS; default: return 0; } } |