summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2019-10-23 11:50:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-13 08:52:48 +0100
commitcdaeaea6aa1bc6de2974c9058ed98dac59209d5b (patch)
treed6aaff703861bd8b05299766b612fb913bb4c995 /crypto
parentbe7993dd8e8ce27f0f66b5079de8fe7219a6883e (diff)
downloadlinux-stable-cdaeaea6aa1bc6de2974c9058ed98dac59209d5b.tar.gz
linux-stable-cdaeaea6aa1bc6de2974c9058ed98dac59209d5b.tar.bz2
linux-stable-cdaeaea6aa1bc6de2974c9058ed98dac59209d5b.zip
crypto: ecdh - fix big endian bug in ECC library
commit f398243e9fd6a3a059c1ea7b380c40628dbf0c61 upstream. The elliptic curve arithmetic library used by the EC-DH KPP implementation assumes big endian byte order, and unconditionally reverses the byte and word order of multi-limb quantities. On big endian systems, the byte reordering is not necessary, while the word ordering needs to be retained. So replace the __swab64() invocation with a call to be64_to_cpu() which should do the right thing for both little and big endian builds. Fixes: 3c4b23901a0c ("crypto: ecdh - Add ECDH software support") Cc: <stable@vger.kernel.org> # v4.9+ Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> 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/ecc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/ecc.c b/crypto/ecc.c
index ed1237115066..ad739255951f 100644
--- a/crypto/ecc.c
+++ b/crypto/ecc.c
@@ -906,10 +906,11 @@ static void ecc_point_mult(struct ecc_point *result,
static inline void ecc_swap_digits(const u64 *in, u64 *out,
unsigned int ndigits)
{
+ const __be64 *src = (__force __be64 *)in;
int i;
for (i = 0; i < ndigits; i++)
- out[i] = __swab64(in[ndigits - 1 - i]);
+ out[i] = be64_to_cpu(src[ndigits - 1 - i]);
}
static int __ecc_is_key_valid(const struct ecc_curve *curve,