[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <6677122.Oqut6OGZ1C@wuerfel>
Date: Fri, 27 Nov 2015 14:52:33 +0100
From: Arnd Bergmann <arnd@...db.de>
To: Mimi Zohar <zohar@...ux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@...wei.com>
Cc: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
James Morris <james.l.morris@...cle.com>,
"Serge E. Hallyn" <serge@...lyn.com>,
linux-ima-devel@...ts.sourceforge.net,
linux-security-module@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] 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@...db.de>
Fixes: 7f753c992343 ("evm: load x509 certificate from the kernel")
---
Found on yesterday's linux-next with ARM randconfig builds
diff --git a/security/integrity/evm/Kconfig b/security/integrity/evm/Kconfig
index b1433e9cd8cb..87e83adf4c6e 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 X509 certificate to the '.evm' trusted keyring"
- depends on INTEGRITY_TRUSTED_KEYRING
+ depends on EVM && INTEGRITY_TRUSTED_KEYRING
default n
help
Load X509 certificate to the '.evm' trusted keyring.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists