linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: "Vlastimil Babka" <vbabka@suse.cz>,
	"Jarkko Sakkinen" <jarkko@kernel.org>,
	"Jan Dąbroś" <jsd@semihalf.com>,
	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
Cc: "Jason A . Donenfeld" <Jason@zx2c4.com>, stable@vger.kernel.org
Subject: [PATCH v3] char: tpm: Protect tpm_pm_suspend with locks
Date: Mon, 28 Nov 2022 20:56:51 +0100	[thread overview]
Message-ID: <20221128195651.322822-1-Jason@zx2c4.com> (raw)

From: Jan Dabros <jsd@semihalf.com>

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]  <TASK>
[    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 <jsd@semihalf.com>
Reported-by: Vlastimil Babka <vbabka@suse.cz>
Tested-by: Jason A. Donenfeld <Jason@zx2c4.com>
Tested-by: Vlastimil Babka <vbabka@suse.cz>
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 <Jason@zx2c4.com>
---
 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


             reply	other threads:[~2022-11-28 19:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-28 19:56 Jason A. Donenfeld [this message]
2022-12-02  9:32 ` [PATCH v3] char: tpm: Protect tpm_pm_suspend with locks Thorsten Leemhuis
2022-12-02  9:46   ` Jason A. Donenfeld
2022-12-02 10:09     ` Jan Dąbroś
2022-12-03 10:25   ` Jason A. Donenfeld
2022-12-04 17:06 ` Jarkko Sakkinen
2022-12-04 17:10   ` Jarkko Sakkinen
2022-12-04 19:14     ` Jason A. Donenfeld
2022-12-08  9:23       ` Jarkko Sakkinen
2022-12-08 10:51         ` Vlastimil Babka
2022-12-10  1:57           ` Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221128195651.322822-1-Jason@zx2c4.com \
    --to=jason@zx2c4.com \
    --cc=apronin@google.com \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=jarkko@kernel.org \
    --cc=jgg@ziepe.ca \
    --cc=jsd@semihalf.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mw@semihalf.com \
    --cc=peterhuewe@gmx.de \
    --cc=rrangel@chromium.org \
    --cc=stable@vger.kernel.org \
    --cc=timvp@google.com \
    --cc=upstream@semihalf.com \
    --cc=vbabka@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).