From nobody Thu Oct 2 03:27:31 2025 Received: from the.earth.li (the.earth.li [93.93.131.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B30E61E2614; Tue, 23 Sep 2025 17:10:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=93.93.131.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758647425; cv=none; b=htY6VCegPNX+mN43Bz4flv1uMbq0A6W3lElDCEpVJF41bU6c2R7v+QVFPlAgcFn1jZ10xaj8hEGYVvC/juwWwq5N5NW5XzKM4XSRKkszbaCIhD67gbY4AjapkJUA41uvPLdeg8GD6Wpr9B3lBMPKLk/ARMF0GOLkT5tjQdFSF+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758647425; c=relaxed/simple; bh=ZOzu9BdZ0SlwHBmXmTTqAUFZJ8YWSzPhWk3/MnnRPCs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=PAuBWma1tRKOlW45rb9j27ddnqFlqq/0CJhQRqPVUMaEvDMMhwJHt4/uair90LKGbxSXBh+Ijpw1LxmwqkvIKNrnFwOkf0InSesV4VCAWiTNh40TZcd7iBrHBuLnPk10YoApBQATI6Ic+AO1ueIsbmncAzHSVU4BrL6rpiY4ztY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=earth.li; spf=pass smtp.mailfrom=earth.li; dkim=pass (2048-bit key) header.d=earth.li header.i=@earth.li header.b=kGZX5MMY; arc=none smtp.client-ip=93.93.131.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=earth.li Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=earth.li Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=earth.li header.i=@earth.li header.b="kGZX5MMY" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=earth.li; s=the; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject: Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=AkJbGSmYgk7y1LEJPqfv5uvY4sEAiOWetkFPsQTO1RI=; b=kGZX5MMYK0xSsHQq4NbkyhaP+6 YEMFQQHdmHk6lEdDizpbaFfZHurqG1serbJ/2h1skupTSQeQ2pIoolneB+kfVkLLY9n54LMiOm2SY 3RLNGzCOBIuZlK/ak1jtI97Q/zFyXdmcPZb8JExoNNu2cQDlOLAVcsjr/mUQdl80CWGyT9CqGe9w4 HpItYmLirhR5Igdbv1fBmyvVGnLs38mThLwP0bvWdjrJjJSOWXDQihVAQcnM/gybmk3rNMZT1877j Ah1hqcMYBe5wIxMxbn859zb4Cm/XYBkCBRwae36onHeJzGulzW/qK0GZR5uaYWD5qYTL3oUY5kJ9s 2jCbBq+Q==; Received: from noodles by the.earth.li with local (Exim 4.96) (envelope-from ) id 1v16Wx-00CZmE-2e; Tue, 23 Sep 2025 18:10:19 +0100 Date: Tue, 23 Sep 2025 18:10:19 +0100 From: Jonathan McDowell To: Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] tpm: Allow for exclusive TPM access when using /dev/tpm Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jonathan McDowell There are situations where userspace might reasonably desire exclusive access to the TPM, or the kernel's internal context saving + flushing may cause issues, for example when performing firmware upgrades. Extend the locking already used for avoiding concurrent userspace access to prevent internal users of the TPM when /dev/tpm is in use. The few internal users who already hold the open_lock are changed to use tpm_(try_get|put)_ops_locked, with the old tpm_(try_get|put)_ops functions changing to obtain read access to the open_lock. We return -EBUSY when another user has exclusive access, rather than adding waits. Signed-off-by: Jonathan McDowell Reviewed-by: Jarkko Sakkinen --- v2: Switch to _locked instead of _internal_ for function names. drivers/char/tpm/tpm-chip.c | 53 +++++++++++++++++++++++++------ drivers/char/tpm/tpm-dev-common.c | 8 ++--- drivers/char/tpm/tpm.h | 2 ++ drivers/char/tpm/tpm2-space.c | 5 ++- 4 files changed, 52 insertions(+), 16 deletions(-) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index ba906966721a..687f6d8cd601 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -144,7 +144,7 @@ void tpm_chip_stop(struct tpm_chip *chip) EXPORT_SYMBOL_GPL(tpm_chip_stop); =20 /** - * tpm_try_get_ops() - Get a ref to the tpm_chip + * tpm_try_get_ops_locked() - Get a ref to the tpm_chip * @chip: Chip to ref * * The caller must already have some kind of locking to ensure that chip is @@ -154,7 +154,7 @@ EXPORT_SYMBOL_GPL(tpm_chip_stop); * * Returns -ERRNO if the chip could not be got. */ -int tpm_try_get_ops(struct tpm_chip *chip) +int tpm_try_get_ops_locked(struct tpm_chip *chip) { int rc =3D -EIO; =20 @@ -185,22 +185,57 @@ int tpm_try_get_ops(struct tpm_chip *chip) put_device(&chip->dev); return rc; } -EXPORT_SYMBOL_GPL(tpm_try_get_ops); =20 /** - * tpm_put_ops() - Release a ref to the tpm_chip + * tpm_put_ops_locked() - Release a ref to the tpm_chip * @chip: Chip to put * - * This is the opposite pair to tpm_try_get_ops(). After this returns chip= may - * be kfree'd. + * This is the opposite pair to tpm_try_get_ops_locked(). After this retur= ns + * chip may be kfree'd. */ -void tpm_put_ops(struct tpm_chip *chip) +void tpm_put_ops_locked(struct tpm_chip *chip) { tpm_chip_stop(chip); mutex_unlock(&chip->tpm_mutex); up_read(&chip->ops_sem); put_device(&chip->dev); } + +/** + * tpm_try_get_ops() - Get a ref to the tpm_chip + * @chip: Chip to ref + * + * The caller must already have some kind of locking to ensure that chip is + * valid. This function will attempt to get the open_lock for the chip, + * ensuring no other user is expecting exclusive access, before locking the + * chip so that the ops member can be accessed safely. The locking prevents + * tpm_chip_unregister from completing, so it should not be held for long + * periods. + * + * Returns -ERRNO if the chip could not be got. + */ +int tpm_try_get_ops(struct tpm_chip *chip) +{ + if (!down_read_trylock(&chip->open_lock)) + return -EBUSY; + + return tpm_try_get_ops_locked(chip); +} +EXPORT_SYMBOL_GPL(tpm_try_get_ops); + +/** + * tpm_put_ops() - Release a ref to the tpm_chip + * @chip: Chip to put + * + * This is the opposite pair to tpm_try_get_ops(). After this returns + * chip may be kfree'd. + */ +void tpm_put_ops(struct tpm_chip *chip) +{ + tpm_put_ops_locked(chip); + + up_read(&chip->open_lock); +} EXPORT_SYMBOL_GPL(tpm_put_ops); =20 /** @@ -644,10 +679,10 @@ void tpm_chip_unregister(struct tpm_chip *chip) #ifdef CONFIG_TCG_TPM2_HMAC int rc; =20 - rc =3D tpm_try_get_ops(chip); + rc =3D tpm_try_get_ops_locked(chip); if (!rc) { tpm2_end_auth_session(chip); - tpm_put_ops(chip); + tpm_put_ops_locked(chip); } #endif =20 diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-c= ommon.c index f2a5e09257dd..0f5bc63411aa 100644 --- a/drivers/char/tpm/tpm-dev-common.c +++ b/drivers/char/tpm/tpm-dev-common.c @@ -65,7 +65,7 @@ static void tpm_dev_async_work(struct work_struct *work) =20 mutex_lock(&priv->buffer_mutex); priv->command_enqueued =3D false; - ret =3D tpm_try_get_ops(priv->chip); + ret =3D tpm_try_get_ops_locked(priv->chip); if (ret) { priv->response_length =3D ret; goto out; @@ -73,7 +73,7 @@ static void tpm_dev_async_work(struct work_struct *work) =20 ret =3D tpm_dev_transmit(priv->chip, priv->space, priv->data_buffer, sizeof(priv->data_buffer)); - tpm_put_ops(priv->chip); + tpm_put_ops_locked(priv->chip); =20 /* * If ret is > 0 then tpm_dev_transmit returned the size of the @@ -220,14 +220,14 @@ ssize_t tpm_common_write(struct file *file, const cha= r __user *buf, * lock during this period so that the tpm can be unregistered even if * the char dev is held open. */ - if (tpm_try_get_ops(priv->chip)) { + if (tpm_try_get_ops_locked(priv->chip)) { ret =3D -EPIPE; goto out; } =20 ret =3D tpm_dev_transmit(priv->chip, priv->space, priv->data_buffer, sizeof(priv->data_buffer)); - tpm_put_ops(priv->chip); + tpm_put_ops_locked(priv->chip); =20 if (ret > 0) { priv->response_length =3D ret; diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 9c158c55c05f..c2ec56e2cd24 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -272,6 +272,8 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, const struct tpm_class_ops *ops); struct tpm_chip *tpmm_chip_alloc(struct device *pdev, const struct tpm_class_ops *ops); +int tpm_try_get_ops_locked(struct tpm_chip *chip); +void tpm_put_ops_locked(struct tpm_chip *chip); int tpm_chip_register(struct tpm_chip *chip); void tpm_chip_unregister(struct tpm_chip *chip); =20 diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c index 60354cd53b5c..0ad5e18355e0 100644 --- a/drivers/char/tpm/tpm2-space.c +++ b/drivers/char/tpm/tpm2-space.c @@ -58,10 +58,9 @@ int tpm2_init_space(struct tpm_space *space, unsigned in= t buf_size) =20 void tpm2_del_space(struct tpm_chip *chip, struct tpm_space *space) { - - if (tpm_try_get_ops(chip) =3D=3D 0) { + if (tpm_try_get_ops_locked(chip) =3D=3D 0) { tpm2_flush_sessions(chip, space); - tpm_put_ops(chip); + tpm_put_ops_locked(chip); } =20 kfree(space->context_buf); --=20 2.51.0