diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2015-11-27 14:52:33 +0100 |
|---|---|---|
| committer |   Mimi Zohar <zohar@linux.vnet.ibm.com> | 2015-12-15 09:57:21 -0500 |
| commit | 05d3884b1ee66d83ad70ffa658c7b363797e2b0c (patch) | |
| tree | 8953d32bc5311a07fa9b82bfb6fa2e3f92475721 /security/integrity | |
| parent | evm: reset EVM status when file attributes change (diff) | |
| download | linux-dev-05d3884b1ee66d83ad70ffa658c7b363797e2b0c.tar.xz linux-dev-05d3884b1ee66d83ad70ffa658c7b363797e2b0c.zip | |
evm: EVM_LOAD_X509 depends on EVM
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>
Diffstat (limited to 'security/integrity')
| -rw-r--r-- | security/integrity/evm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/evm/Kconfig b/security/integrity/evm/Kconfig index 913532c5db4f..e825e0ae78e7 100644 --- a/security/integrity/evm/Kconfig +++ b/security/integrity/evm/Kconfig @@ -44,7 +44,7 @@ config EVM_EXTRA_SMACK_XATTRS config EVM_LOAD_X509 bool "Load an X509 certificate onto the '.evm' trusted keyring" - depends on INTEGRITY_TRUSTED_KEYRING + depends on EVM && INTEGRITY_TRUSTED_KEYRING default n help Load an X509 certificate onto the '.evm' trusted keyring. |