diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 11:20:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 11:20:39 -0700 |
| commit | 0c8e2f2c7b86c29775379f716f7db07516fcbcbf (patch) | |
| tree | 32d0c2605545a9cf54d45a279daa43c09043cffc | |
| parent | userfaultfd: selftest: update userfaultfd x86 32bit syscall number (diff) | |
| parent | crypto: ghash-clmulni: specify context size for ghash async algorithm (diff) | |
| download | linux-dev-0c8e2f2c7b86c29775379f716f7db07516fcbcbf.tar.xz linux-dev-0c8e2f2c7b86c29775379f716f7db07516fcbcbf.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a memory corruption bug in ghash-clmulni-intel due to
insufficient memory allocation"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ghash-clmulni: specify context size for ghash async algorithm
| -rw-r--r-- | arch/x86/crypto/ghash-clmulni-intel_glue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c index 64d7cf1b50e1..440df0c7a2ee 100644 --- a/arch/x86/crypto/ghash-clmulni-intel_glue.c +++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c @@ -294,6 +294,7 @@ static struct ahash_alg ghash_async_alg = { .cra_name = "ghash", .cra_driver_name = "ghash-clmulni", .cra_priority = 400, + .cra_ctxsize = sizeof(struct ghash_async_ctx), .cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC, .cra_blocksize = GHASH_BLOCK_SIZE, .cra_type = &crypto_ahash_type, |