diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-05 20:16:10 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-05 20:16:10 +0300 |
| commit | ef3263e35e26eb1061260131c4d6d579eea21f85 (patch) | |
| tree | 640cf71ae612ea28b5dd91a2a9d6a005f50a7345 /include | |
| parent | 3e5de27e940d00d8d504dfb96625fb654f641509 (diff) | |
| parent | 57891633eeef60e732e045731cf20e50ee80acb4 (diff) | |
| download | linux-ef3263e35e26eb1061260131c4d6d579eea21f85.tar.xz | |
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 the following issues:
- Intermittent build failure in RSA
- Memory corruption in chelsio crypto driver
- Regression in DRBG due to vmalloced stack"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: rsa - Add Makefile dependencies to fix parallel builds
crypto: chcr - Fix memory corruption
crypto: drbg - prevent invalid SG mappings
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/drbg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/crypto/drbg.h b/include/crypto/drbg.h index 61580b19f9f6..22f884c97387 100644 --- a/include/crypto/drbg.h +++ b/include/crypto/drbg.h @@ -124,6 +124,8 @@ struct drbg_state { struct skcipher_request *ctr_req; /* CTR mode request handle */ __u8 *ctr_null_value_buf; /* CTR mode unaligned buffer */ __u8 *ctr_null_value; /* CTR mode aligned zero buf */ + __u8 *outscratchpadbuf; /* CTR mode output scratchpad */ + __u8 *outscratchpad; /* CTR mode aligned outbuf */ struct completion ctr_completion; /* CTR mode async handler */ int ctr_async_err; /* CTR mode async error */ |