Commit 7031ecff authored by Linus Torvalds's avatar Linus Torvalds

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 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
parents bc570c14 c9cc0517
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
config AMDTEE config AMDTEE
tristate "AMD-TEE" tristate "AMD-TEE"
default m default m
depends on CRYPTO_DEV_SP_PSP depends on CRYPTO_DEV_SP_PSP && CRYPTO_DEV_CCP_DD
help help
This implements AMD's Trusted Execution Environment (TEE) driver. This implements AMD's Trusted Execution Environment (TEE) driver.
...@@ -235,6 +235,9 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src, ...@@ -235,6 +235,9 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src,
__le64 lens[2]; __le64 lens[2];
} b __aligned(16); } b __aligned(16);
if (WARN_ON(src_len > INT_MAX))
return false;
chacha_load_key(b.k, key); chacha_load_key(b.k, key);
b.iv[0] = 0; b.iv[0] = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment