Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp699111rwb; Thu, 8 Dec 2022 01:36:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf77wcVmotzpSLUaYvyr18rK/+Q/i3jLXFX3tlYsvtlBfHerXnMIaGOqgrqa59EiH6EBge98 X-Received: by 2002:a17:90a:f481:b0:219:56eb:c228 with SMTP id bx1-20020a17090af48100b0021956ebc228mr43570465pjb.81.1670492212626; Thu, 08 Dec 2022 01:36:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670492212; cv=none; d=google.com; s=arc-20160816; b=T0TNjSyh5dq2LHyOf8DOBht59cAcqv3wvSO5rwWn44TXDoV/fL7/rbNd4B1Uwn+fUs ebeGZdiMKIDjpRcaxmyPWnCXIuFdEg/bW7iGBEUynHJJa+Ya2pGzH14tpDwurjMuBWuc 42ARg+dTdr4YTtM4rTy/8SjhfGysGzdMzQAzxCrGplHsN6VS3cfA9/WZ0Gzx3u3VMEGO F2ZBpJFdOUzYEV9oYwizVRS1uvsXFpIGd7XxIR2TuaE9bDkzKQua4sTtiLbYd0TnC1ib s/rr0zQ6oCcIh0in+sKC/jGjBsbuXnll0w7VRfkzGcGuLPyVJ3c3qbgUsl6ZJzNndagR lKug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=9580/A8WOekvTPqYn4QM8Jmb9XwRW7IbRT79MINYtHo=; b=FwTRARCWb2ZKKvXKfZuKw72Veom5ZjnsfYCHN7itwgPctm8f9prrHJan2cOGAUyboT SPbeDoN7BMVMtI3OcCsxhoryD0lj2aCeMD85H1KDWKdka3oNTqeifZLl28x9UFPl0GaG hc9L1I1ctrsRj17nIM9RiyFwPALdUd/ICrSSlKnhSLr4KV9hTcOadfk7NvilS0ErUfcR fdGvahR73y5hIGS6maALeV6fd/E3lJTG+u6MF9S2/QFNx6LnpsndF3S2xstuZYQ9JV2U Ns6U81xp+B3x39vUbkoPcd+aZ7+Eza/rG2fntSlEveJcd1anOGZHj8SL7SvFup4jecWc THnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lM0mxqNb; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x84-20020a633157000000b00463fc72dae9si23918439pgx.144.2022.12.08.01.36.33; Thu, 08 Dec 2022 01:36:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lM0mxqNb; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229911AbiLHJXL (ORCPT + 99 others); Thu, 8 Dec 2022 04:23:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229650AbiLHJXJ (ORCPT ); Thu, 8 Dec 2022 04:23:09 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AC1458BF8; Thu, 8 Dec 2022 01:23:08 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B8DAE61E04; Thu, 8 Dec 2022 09:23:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C91A1C433C1; Thu, 8 Dec 2022 09:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670491387; bh=Pyvsh6dNxc4HyaxTZC50pJ+mJJTEHkJ0yEeOFq7Ogtg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lM0mxqNbjFKVZaNSAF2Q5ScBfU3ZH4tDZo69w55WIKrcund6O1FP1G6l6We9svoNA 3JNiDHPn6h5Fx6TY0CZnUxf01ApSvRurtC39cHYouBmnjwCo06eX7Sjy1O/X7NVxXN fOxhB6gj8sTLHUMLH6VVKFW7iJBWxBe0xC3MhLpQaZHRG34tPaZgNOMQtWNMPY2I55 AIBQvF2V0RFrOQiXZJQ0LWtM2inYP3kcTVwGb8LyzSSYdm6X6nEQ009UCSnPzQ0m1p gwKhpc4a6EkDJ92mtU8vNHY3eoFTxHkwCPWaYegdYF+nq8WMvJjEUpWHBhVa5iheg9 gYFIXksKNL+pg== Date: Thu, 8 Dec 2022 09:23:02 +0000 From: Jarkko Sakkinen To: "Jason A. Donenfeld" Cc: Vlastimil Babka , Jan =?utf-8?B?RMSFYnJvxZs=?= , linux-integrity@vger.kernel.org, peterhuewe@gmx.de, jgg@ziepe.ca, gregkh@linuxfoundation.org, arnd@arndb.de, rrangel@chromium.org, timvp@google.com, apronin@google.com, mw@semihalf.com, upstream@semihalf.com, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH v3] char: tpm: Protect tpm_pm_suspend with locks Message-ID: References: <20221128195651.322822-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On Sun, Dec 04, 2022 at 08:14:31PM +0100, Jason A. Donenfeld wrote: > On Sun, Dec 04, 2022 at 05:10:58PM +0000, Jarkko Sakkinen wrote: > > On Sun, Dec 04, 2022 at 05:06:41PM +0000, Jarkko Sakkinen wrote: > > > On Mon, Nov 28, 2022 at 08:56:51PM +0100, Jason A. Donenfeld wrote: > > > > From: Jan Dabros > > > > > > > > Currently tpm transactions are executed unconditionally in > > > > tpm_pm_suspend() function, which may lead to races with other tpm > > > > accessors in the system. Specifically, the hw_random tpm driver makes > > > > use of tpm_get_random(), and this function is called in a loop from a > > > > kthread, which means it's not frozen alongside userspace, and so can > > > > race with the work done during system suspend: > > > > > > > > [ 3.277834] tpm tpm0: tpm_transmit: tpm_recv: error -52 > > > > [ 3.278437] tpm tpm0: invalid TPM_STS.x 0xff, dumping stack for forensics > > > > [ 3.278445] CPU: 0 PID: 1 Comm: init Not tainted 6.1.0-rc5+ #135 > > > > [ 3.278450] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.0-20220807_005459-localhost 04/01/2014 > > > > [ 3.278453] Call Trace: > > > > [ 3.278458] > > > > [ 3.278460] dump_stack_lvl+0x34/0x44 > > > > [ 3.278471] tpm_tis_status.cold+0x19/0x20 > > > > [ 3.278479] tpm_transmit+0x13b/0x390 > > > > [ 3.278489] tpm_transmit_cmd+0x20/0x80 > > > > [ 3.278496] tpm1_pm_suspend+0xa6/0x110 > > > > [ 3.278503] tpm_pm_suspend+0x53/0x80 > > > > [ 3.278510] __pnp_bus_suspend+0x35/0xe0 > > > > [ 3.278515] ? pnp_bus_freeze+0x10/0x10 > > > > [ 3.278519] __device_suspend+0x10f/0x350 > > > > > > > > Fix this by calling tpm_try_get_ops(), which itself is a wrapper around > > > > tpm_chip_start(), but takes the appropriate mutex. > > > > > > > > Signed-off-by: Jan Dabros > > > > Reported-by: Vlastimil Babka > > > > Tested-by: Jason A. Donenfeld > > > > Tested-by: Vlastimil Babka > > > > Link: https://lore.kernel.org/all/c5ba47ef-393f-1fba-30bd-1230d1b4b592@suse.cz/ > > > > Cc: stable@vger.kernel.org > > > > Fixes: e891db1a18bf ("tpm: turn on TPM on suspend for TPM 1.x") > > > > [Jason: reworked commit message, added metadata] > > > > Signed-off-by: Jason A. Donenfeld > > > > --- > > > > drivers/char/tpm/tpm-interface.c | 5 +++-- > > > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > > > > index 1621ce818705..d69905233aff 100644 > > > > --- a/drivers/char/tpm/tpm-interface.c > > > > +++ b/drivers/char/tpm/tpm-interface.c > > > > @@ -401,13 +401,14 @@ int tpm_pm_suspend(struct device *dev) > > > > !pm_suspend_via_firmware()) > > > > goto suspended; > > > > > > > > - if (!tpm_chip_start(chip)) { > > > > + rc = tpm_try_get_ops(chip); > > > > + if (!rc) { > > > > if (chip->flags & TPM_CHIP_FLAG_TPM2) > > > > tpm2_shutdown(chip, TPM2_SU_STATE); > > > > else > > > > rc = tpm1_pm_suspend(chip, tpm_suspend_pcr); > > > > > > > > - tpm_chip_stop(chip); > > > > + tpm_put_ops(chip); > > > > } > > > > > > > > suspended: > > > > -- > > > > 2.38.1 > > > > > > > > > > Hi, sorry for the latency. > > > > > > Reviewed-by: Jarkko Sakkinen > > > > Applied to git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git > > Oh thank goodness. You'll send this in for rc8 today? for 6.2-rc1 BR, Jarkko