diff options
author | Kees Cook <keescook@chromium.org> | 2018-09-18 22:10:51 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-09-28 00:46:08 -0400 |
commit | 8d605398425843c7ce3c0e9a0434d832d3bd54cc (patch) | |
tree | 9367982359561def8ee697e06669e2a8a15c99f0 /include/crypto | |
parent | 5c525640ef455b23ce911ac71eb22c7256031b9a (diff) |
crypto: null - Remove VLA usage of skcipher
In the quest to remove all stack VLA usage from the kernel[1], this
replaces struct crypto_skcipher and SKCIPHER_REQUEST_ON_STACK() usage
with struct crypto_sync_skcipher and SYNC_SKCIPHER_REQUEST_ON_STACK(),
which uses a fixed stack size.
[1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto')
-rw-r--r-- | include/crypto/internal/geniv.h | 2 | ||||
-rw-r--r-- | include/crypto/null.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/crypto/internal/geniv.h b/include/crypto/internal/geniv.h index 2bcfb931bc5b..71be24cd59bd 100644 --- a/include/crypto/internal/geniv.h +++ b/include/crypto/internal/geniv.h | |||
@@ -20,7 +20,7 @@ | |||
20 | struct aead_geniv_ctx { | 20 | struct aead_geniv_ctx { |
21 | spinlock_t lock; | 21 | spinlock_t lock; |
22 | struct crypto_aead *child; | 22 | struct crypto_aead *child; |
23 | struct crypto_skcipher *sknull; | 23 | struct crypto_sync_skcipher *sknull; |
24 | u8 salt[] __attribute__ ((aligned(__alignof__(u32)))); | 24 | u8 salt[] __attribute__ ((aligned(__alignof__(u32)))); |
25 | }; | 25 | }; |
26 | 26 | ||
diff --git a/include/crypto/null.h b/include/crypto/null.h index 15aeef6e30ef..0ef577cc00e3 100644 --- a/include/crypto/null.h +++ b/include/crypto/null.h | |||
@@ -9,7 +9,7 @@ | |||
9 | #define NULL_DIGEST_SIZE 0 | 9 | #define NULL_DIGEST_SIZE 0 |
10 | #define NULL_IV_SIZE 0 | 10 | #define NULL_IV_SIZE 0 |
11 | 11 | ||
12 | struct crypto_skcipher *crypto_get_default_null_skcipher(void); | 12 | struct crypto_sync_skcipher *crypto_get_default_null_skcipher(void); |
13 | void crypto_put_default_null_skcipher(void); | 13 | void crypto_put_default_null_skcipher(void); |
14 | 14 | ||
15 | #endif | 15 | #endif |