Commit ea1c87c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes a functional bug in arm/chacha-neon as well as a potential
  buffer overflow in ecdh"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ecdh - avoid buffer overflow in ecdh_set_secret()
  crypto: arm/chacha-neon - add missing counter increment
parents ef0ba055 0aa171e9

arch/arm/crypto/chacha-glue.c

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static void chacha_doneon(u32 *state, u8 *dst, const u8 *src, 
		chacha_block_xor_neon(state, d, s, nrounds);

		if (d != dst)

			memcpy(dst, buf, bytes);

		state[12]++;

	}

}

crypto/ecdh.c

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ static int ecdh_set_secret(struct crypto_kpp *tfm, const void *buf, 
	struct ecdh params;

	unsigned int ndigits;



	if (crypto_ecdh_decode_key(buf, len, &params) < 0)

	if (crypto_ecdh_decode_key(buf, len, &params) < 0 ||

	    params.key_size > sizeof(ctx->private_key))

		return -EINVAL;



	ndigits = ecdh_supported_curve(params.curve_id);