From: Vincent Whitchurch <vincent.whitchurch@axis.com>
To: Peter Huewe <peterhuewe@gmx.de>,
Jarkko Sakkinen <jarkko@kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>
Cc: <kernel@axis.com>,
Vincent Whitchurch <vincent.whitchurch@axis.com>,
<linux-integrity@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/2] tpm: Fix crash on tmprm release
Date: Tue, 15 Jun 2021 11:14:09 +0200 [thread overview]
Message-ID: <20210615091410.17007-2-vincent.whitchurch@axis.com> (raw)
In-Reply-To: <20210615091410.17007-1-vincent.whitchurch@axis.com>
If the tpm_tis module is removed (or a system shutdown is triggered)
while the tpmrm device is use, the kernel crashes due to chip->ops being
NULL:
# exec 3<>/dev/tpmrm0
# rmmod tpm_tis
# exit
==================================================================
BUG: KASAN: null-ptr-deref in tpm_chip_start+0x2d/0x120 [tpm]
Read of size 8 at addr 0000000000000060 by task sh/994
Call Trace:
kasan_report.cold.13+0x10f/0x111
tpm_chip_start+0x2d/0x120 [tpm]
tpm2_del_space+0x2c/0xa0 [tpm]
tpmrm_release+0x3f/0x50 [tpm]
__fput+0x110/0x3c0
task_work_run+0x94/0xd0
do_exit+0x683/0x13e0
do_group_exit+0x8b/0x140
do_syscall_64+0x3c/0x80
==================================================================
Fix this by making tpm2_del_space() use tpm_try_get_ops(). The latter
already includes the calls to tpm_chip_start() and tpm_chip_stop().
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
---
drivers/char/tpm/tpm2-space.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c
index 784b8b3cb903..e1111261021f 100644
--- a/drivers/char/tpm/tpm2-space.c
+++ b/drivers/char/tpm/tpm2-space.c
@@ -58,12 +58,10 @@ int tpm2_init_space(struct tpm_space *space, unsigned int buf_size)
void tpm2_del_space(struct tpm_chip *chip, struct tpm_space *space)
{
- mutex_lock(&chip->tpm_mutex);
- if (!tpm_chip_start(chip)) {
+ if (!tpm_try_get_ops(chip)) {
tpm2_flush_sessions(chip, space);
- tpm_chip_stop(chip);
+ tpm_put_ops(chip);
}
- mutex_unlock(&chip->tpm_mutex);
kfree(space->context_buf);
kfree(space->session_buf);
}
--
2.28.0
next prev parent reply other threads:[~2021-06-15 9:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 9:14 [PATCH 1/2] tpm: Fix tpmrm reference counting Vincent Whitchurch
2021-06-15 9:14 ` Vincent Whitchurch [this message]
2021-06-15 13:18 ` [PATCH 2/2] tpm: Fix crash on tmprm release Jarkko Sakkinen
2021-06-17 5:44 ` Vincent Whitchurch
2022-03-03 2:03 ` Stefan Berger
2021-06-16 18:53 ` [PATCH 1/2] tpm: Fix tpmrm reference counting Jason Gunthorpe
2021-06-17 5:38 ` Vincent Whitchurch
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=20210615091410.17007-2-vincent.whitchurch@axis.com \
--to=vincent.whitchurch@axis.com \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=kernel@axis.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
/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).