summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorArtem Savkov <asavkov@redhat.com>2016-10-26 15:02:09 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-10 16:38:47 +0100
commit33bcff297228350cb908e165c8d3031a6c52dde8 (patch)
tree57a5dffc54b79ace6a0de49224a586e056bd8656 /security
parent5152986c9257e797436688d09ebd582b9eadcd2d (diff)
security/keys: make BIG_KEYS dependent on stdrng.
commit 31e6ec4519c0fe0ee4a2f6ba3ab278e9506b9500 upstream. Since BIG_KEYS can't be compiled as module it requires one of the "stdrng" providers to be compiled into kernel. Otherwise big_key_crypto_init() fails on crypto_alloc_rng step and next dereference of big_key_skcipher (e.g. in big_key_preparse()) results in a NULL pointer dereference. Fixes: 13100a72f40f5748a04017e0ab3df4cf27c809ef ('Security: Keys: Big keys stored encrypted') Signed-off-by: Artem Savkov <asavkov@redhat.com> Signed-off-by: David Howells <dhowells@redhat.com> cc: Stephan Mueller <smueller@chronox.de> cc: Kirill Marinushkin <k.marinushkin@gmail.com> Signed-off-by: James Morris <james.l.morris@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
-rw-r--r--security/keys/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/Kconfig b/security/keys/Kconfig
index f826e8739023..d942c7c2bc0a 100644
--- a/security/keys/Kconfig
+++ b/security/keys/Kconfig
@@ -41,7 +41,7 @@ config BIG_KEYS
bool "Large payload keys"
depends on KEYS
depends on TMPFS
- select CRYPTO
+ depends on (CRYPTO_ANSI_CPRNG = y || CRYPTO_DRBG = y)
select CRYPTO_AES
select CRYPTO_ECB
select CRYPTO_RNG