Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

evm: EVM_LOAD_X509 depends on EVM

Browse Source 
The newly added EVM_LOAD_X509 code can be configured even if
CONFIG_EVM is disabled, but that causes a link error:

security/built-in.o: In function `integrity_load_keys':
digsig_asymmetric.c:(.init.text+0x400): undefined reference to `evm_load_x509'

This adds a Kconfig dependency to ensure it is only enabled when
CONFIG_EVM is set as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 2ce523eb8976 ("evm: load x509 certificate from the kernel")
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
This commit is contained in:
Arnd Bergmann 2015-11-27 14:52:33 +01:00 committed by Mimi Zohar
parent 523b74b16b
commit 05d3884b1e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/integrity/evm/Kconfig
View File

@ -44,7 +44,7 @@ config EVM_EXTRA_SMACK_XATTRS
config EVM_LOAD_X509 config EVM_LOAD_X509
bool "Load an X509 certificate onto the '.evm' trusted keyring" bool "Load an X509 certificate onto the '.evm' trusted keyring"
depends on INTEGRITY_TRUSTED_KEYRING depends on EVM && INTEGRITY_TRUSTED_KEYRING
default n default n
help help
Load an X509 certificate onto the '.evm' trusted keyring. Load an X509 certificate onto the '.evm' trusted keyring.