Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (7031ecff) · Commits · 戴 / test

Pull crypto fixes from Herbert Xu: "This fixes a Kconfig-related build error and an integer overflow in chacha20poly1305" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: chacha20poly1305 - prevent integer overflow on large input tee: amdtee: amdtee depends on CRYPTO_DEV_CCP_DD

drivers/tee/amdtee/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,6 @@
		config AMDTEE
		tristate "AMD-TEE"
		default m
		depends on CRYPTO_DEV_SP_PSP
		depends on CRYPTO_DEV_SP_PSP && CRYPTO_DEV_CCP_DD
		help
		This implements AMD's Trusted Execution Environment (TEE) driver.

lib/crypto/chacha20poly1305.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -235,6 +235,9 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src,
		__le64 lens[2];
		} b __aligned(16);

		if (WARN_ON(src_len > INT_MAX))
		return false;

		chacha_load_key(b.k, key);

		b.iv[0] = 0;

Admin message