From patchwork Thu Jan 9 17:50:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lakshmi Ramasubramanian X-Patchwork-Id: 11326227 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86DAD17EE for ; Thu, 9 Jan 2020 17:50:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B0CD205F4 for ; Thu, 9 Jan 2020 17:50:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="nTeh8Vkr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731853AbgAIRuv (ORCPT ); Thu, 9 Jan 2020 12:50:51 -0500 Received: from linux.microsoft.com ([13.77.154.182]:36508 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728724AbgAIRuv (ORCPT ); Thu, 9 Jan 2020 12:50:51 -0500 Received: from nramas-ThinkStation-P520.corp.microsoft.com (unknown [131.107.174.108]) by linux.microsoft.com (Postfix) with ESMTPSA id 8DEDF2007679; Thu, 9 Jan 2020 09:50:50 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8DEDF2007679 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1578592250; bh=cu2JveRyQuDPFRB2esVGRwjQJkbQO22sfT40nDoRZYU=; h=From:To:Cc:Subject:Date:From; b=nTeh8VkrEkVm/QzF3jvtCpMXBK7fCmy9Mp3wGWQwB1xdwwI/Aq2lmLu7o56vZtOkg 96UFm1ZHE/ZNLdwREKjAsrn3TxtHagf3g/asHM8jdwI24I1FtZ3Mm5mPH7TJMnHsMd MgU9mjSmW3xtvahE/H32fn6tRwD+DYzqAwTjDw7s= From: Lakshmi Ramasubramanian To: zohar@linux.ibm.com, James.Bottomley@HansenPartnership.com, linux-integrity@vger.kernel.org Cc: dhowells@redhat.com, arnd@arndb.de, matthewgarrett@google.com, sashal@kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org Subject: [PATCH] IMA: fix measuring early boot asymmetric keys Date: Thu, 9 Jan 2020 09:50:46 -0800 Message-Id: <20200109175046.4024-1-nramas@linux.microsoft.com> X-Mailer: git-send-email 2.17.1 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org As a result of the asymmetric public keys subtype being defined as a tristate, with the existing IMA Makefile, ima_asymmetric_keys.c could be built as a kernel module. To prevent this from happening, an intermediate Kconfig boolean option named IMA_MEASURE_ASYMMETRIC_KEYS has been defined. This patch uses this new config CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS to declare the early boot key measurement functions. Signed-off-by: Lakshmi Ramasubramanian Reported-by: kbuild test robot # redefinition of ima_init_key_queue() function. Suggested-by: James.Bottomley Fixes: e164a1695a57 ("IMA: Define workqueue for early boot key measurements") Fixes: 1df595b4e120 ("IMA: Defined timer to free queued keys") --- security/integrity/ima/ima.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index c483215a9ee5..6bb3152b3e24 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -205,7 +205,7 @@ extern const char *const func_tokens[]; struct modsig; -#ifdef CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE +#ifdef CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS /* * To track keys that need to be measured. */ @@ -220,7 +220,7 @@ void ima_init_key_queue(void); #else static inline void ima_process_queued_keys(void) {} static inline void ima_init_key_queue(void) {} -#endif /* CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE */ +#endif /* CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS */ /* LIM API function definitions */ int ima_get_action(struct inode *inode, const struct cred *cred, u32 secid,