From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DA9DC433FE for ; Sun, 6 Feb 2022 10:37:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233475AbiBFKhL (ORCPT ); Sun, 6 Feb 2022 05:37:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230415AbiBFKhK (ORCPT ); Sun, 6 Feb 2022 05:37:10 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A837BC06173B for ; Sun, 6 Feb 2022 02:37:09 -0800 (PST) Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nGeuc-0002la-07; Sun, 06 Feb 2022 11:36:54 +0100 Message-ID: Date: Sun, 6 Feb 2022 11:36:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 From: Ahmad Fatoum Subject: Re: [PATCH] KEYS: trusted: fix crash when TPM/TEE are built as module To: Tong Zhang , James Bottomley , Jarkko Sakkinen , Mimi Zohar , David Howells , James Morris , "Serge E. Hallyn" , Sumit Garg , linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Rammhold References: <20220204200342.48665-1-ztong0001@gmail.com> Content-Language: en-US In-Reply-To: <20220204200342.48665-1-ztong0001@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: a.fatoum@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-integrity@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Hello Tong, On 04.02.22 21:03, Tong Zhang wrote: > when TCG_TPM and TEE are built as module, trusted_key_sources will be an > empty array, loading it won't do what it is supposed to do and unloading > it will cause kernel crash. Jarkko reported picking up an equivalent fix two months ago: https://lkml.kernel.org/keyrings/YadRAWbl2aiapf8l@iki.fi/ But it seems to have never made it to Linus. Cheers, Ahmad > > To reproduce: > $ modprobe trusted > $ modprobe -r trusted > > [ 173.749423] Unable to handle kernel NULL pointer dereference at virtual address 00000000 > [ 173.755268] Backtrace: > [ 173.755378] cleanup_trusted [trusted] from sys_delete_module+0x15c/0x22c > [ 173.755589] sys_delete_module from ret_fast_syscall+0x0/0x1c > > To fix this issue, we also need to check CONFIG_TCG_TPM_MODULE and > CONFIG_TEE_MODULE. > > Fixes: 5d0682be3189 ("KEYS: trusted: Add generic trusted keys framework") > Signed-off-by: Tong Zhang > --- > security/keys/trusted-keys/trusted_core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c > index d5c891d8d353..b3a3b2f2d4a4 100644 > --- a/security/keys/trusted-keys/trusted_core.c > +++ b/security/keys/trusted-keys/trusted_core.c > @@ -27,10 +27,10 @@ module_param_named(source, trusted_key_source, charp, 0); > MODULE_PARM_DESC(source, "Select trusted keys source (tpm or tee)"); > > static const struct trusted_key_source trusted_key_sources[] = { > -#if defined(CONFIG_TCG_TPM) > +#if defined(CONFIG_TCG_TPM) || defined(CONFIG_TCG_TPM_MODULE) > { "tpm", &trusted_key_tpm_ops }, > #endif > -#if defined(CONFIG_TEE) > +#if defined(CONFIG_TEE) || defined(CONFIG_TEE_MODULE) > { "tee", &trusted_key_tee_ops }, > #endif > }; -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |