From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754757AbbK0NxX (ORCPT ); Fri, 27 Nov 2015 08:53:23 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:53828 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754692AbbK0NxU (ORCPT ); Fri, 27 Nov 2015 08:53:20 -0500 From: Arnd Bergmann To: Mimi Zohar , Dmitry Kasatkin Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, James Morris , "Serge E. Hallyn" , linux-ima-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] evm: EVM_LOAD_X509 depends on EVM Date: Fri, 27 Nov 2015 14:52:33 +0100 Message-ID: <6677122.Oqut6OGZ1C@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:EBevVQRzO8Cvqpk+EmLnlLrFwDXnrOev4QV5YI66lthRiae5Z/s jdLc28IAWn0uSlbk/+ozvZs8Piy/rNeZ7DiTfgsO1fTQpWRkf8+Lpl1ffiVra0tv8yToCrf yAu5Zeyy8zC/WuRJuXuCaGLDvWfh9fsSlop57M4r5FfjfEvsuDspQNc2ukCXmaISiP9gl1q dBBI71NuwjPbJi0x3TzjQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:DJ/NBVhzCdk=:Cx5b2tGm8nT69R6zk3TysK ql7y4buxszuqlCkyYGgvRmNd15qLG+RJE8OOdocNcgC7V1uvE3wx81IOfqSMlV39kGvR7hLc5 jC9kSAhV8joIJpnLIAb1TFGSsU3CeE0obYg5blLvax/XSd/OsP/j342uRUOMYs8BOk27jA3T5 rPdKNgnv6hlVkOmzf6FydLNJ83YtxACUcR9yHuq080rZrWdArDYo7E2r7/g8/Bys8ZcrTelUs eJ4bMc0ll95oBV0wPCLV5rqxEmlkmjuKvk+xhK239sA2ctOcB9Bjsx2uYC75xl6o1yscSbVGd hRSKS38DqBCOIFs98ROxq9Vno8103zpDIq7//CGilS1jX9XBUULqWJlPt78zY2r6BrSR9wCWA f9LdSUJGcLZxq5TspKVAdYd60X3wdkaX/ERSoTsG16kXj55xMdc0mxY4iB86/lySmIfmAQdzZ fXrHJrv6EMJ4GJp5BvqFU1n4LwGBG6sQQnJf7GMyuL+AfpdizGh1ZBriX/ZzodIJ0UJy+IPv9 agcfC03Q++LRPUtxH7iH846gPrSWchp5C1MWJUdLYK/wFZgW8OLgquPFgzjoZFFfsvxq0d8mE FRdHrV9y4LUGNBdLu9B61c1C3whD4X+buvH1MIJCQlpfT29H5f7I0TNtF/WezoRDSp3jjDTBt ICtqYgo4TmUeYTCPpmaoeJiCGqcmN8khq59B2jqhPpg+MoDXdm0PnFnddZEk7OLCdhS3pZl1J RPM8EmywzQDMilUY Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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.