From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Lino Sanfilippo <LinoSanfilippo@gmx.de>,
peterhuewe@gmx.de, jarkko@kernel.org
Cc: jgg@ziepe.ca, stefanb@linux.vnet.ibm.com, stable@vger.kernel.org,
linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
Lino Sanfilippo <l.sanfilippo@kunbus.com>
Subject: Re: [PATCH v3 2/2] tpm: in tpm2_del_space check if ops pointer is still valid
Date: Thu, 04 Feb 2021 16:34:11 -0800 [thread overview]
Message-ID: <7308e5e9f51501bd92cced8f28ff6130c976b3ed.camel@HansenPartnership.com> (raw)
In-Reply-To: <1612482643-11796-3-git-send-email-LinoSanfilippo@gmx.de>
On Fri, 2021-02-05 at 00:50 +0100, Lino Sanfilippo wrote:
> From: Lino Sanfilippo <l.sanfilippo@kunbus.com>
>
> In tpm2_del_space() chip->ops is used for flushing the sessions.
> However
> this function may be called after tpm_chip_unregister() which sets
> the chip->ops pointer to NULL.
> Avoid a possible NULL pointer dereference by checking if chip->ops is
> still
> valid before accessing it.
>
> Fixes: a3fbfae82b4c ("tpm: take TPM chip power gating out of
> tpm_transmit()")
> Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com>
> ---
> drivers/char/tpm/tpm2-space.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-
> space.c
> index 784b8b3..9a29a40 100644
> --- a/drivers/char/tpm/tpm2-space.c
> +++ b/drivers/char/tpm/tpm2-space.c
> @@ -58,12 +58,17 @@ 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)) {
> - tpm2_flush_sessions(chip, space);
> - tpm_chip_stop(chip);
> + down_read(&chip->ops_sem);
> + if (chip->ops) {
> + mutex_lock(&chip->tpm_mutex);
> + if (!tpm_chip_start(chip)) {
> + tpm2_flush_sessions(chip, space);
> + tpm_chip_stop(chip);
> + }
> + mutex_unlock(&chip->tpm_mutex);
> }
> - mutex_unlock(&chip->tpm_mutex);
> + up_read(&chip->ops_sem);
> +
> kfree(space->context_buf);
> kfree(space->session_buf);
> }
Actually, this still isn't right. As I said to the last person who
reported this, we should be doing a get/put on the ops, not rolling our
own here:
https://lore.kernel.org/linux-integrity/e7566e1e48f5be9dca034b4bfb67683b5d3cb88f.camel@HansenPartnership.com/
The reporter went silent before we could get this tested, but could you
try, please, because your patch is still hand rolling the ops get/put,
just slightly better than it had been done previously.
James
next prev parent reply other threads:[~2021-02-05 0:35 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 23:50 [PATCH v3 0/2] TPM fixes Lino Sanfilippo
2021-02-04 23:50 ` [PATCH v3 1/2] tpm: fix reference counting for struct tpm_chip Lino Sanfilippo
2021-02-05 0:46 ` Stefan Berger
2021-02-05 1:44 ` Stefan Berger
2021-02-05 2:01 ` James Bottomley
2021-02-05 10:52 ` Lino Sanfilippo
2021-02-05 13:29 ` Stefan Berger
2021-02-05 10:34 ` Lino Sanfilippo
2021-02-05 6:50 ` Greg KH
2021-02-05 13:05 ` Jason Gunthorpe
2021-02-05 14:55 ` Lino Sanfilippo
2021-02-05 15:15 ` Jason Gunthorpe
2021-02-05 15:50 ` Lino Sanfilippo
2021-02-05 15:58 ` Jason Gunthorpe
2021-02-05 21:50 ` Lino Sanfilippo
2021-02-06 0:39 ` Jason Gunthorpe
2021-02-04 23:50 ` [PATCH v3 2/2] tpm: in tpm2_del_space check if ops pointer is still valid Lino Sanfilippo
2021-02-05 0:34 ` James Bottomley [this message]
2021-02-05 2:18 ` Jarkko Sakkinen
2021-02-05 16:48 ` James Bottomley
2021-02-05 17:25 ` Jason Gunthorpe
2021-02-05 17:54 ` James Bottomley
2021-02-06 1:02 ` Jason Gunthorpe
2021-02-06 1:08 ` James Bottomley
2021-02-06 1:34 ` Jason Gunthorpe
2021-02-09 11:52 ` Lino Sanfilippo
2021-02-09 13:36 ` Jason Gunthorpe
2021-02-09 13:39 ` Lino Sanfilippo
2021-02-12 11:02 ` Jarkko Sakkinen
2021-02-12 10:59 ` Jarkko Sakkinen
2021-02-14 17:22 ` Lino Sanfilippo
2021-02-05 10:30 ` Lino Sanfilippo
2021-03-06 16:07 ` Lino Sanfilippo
2021-02-05 6:51 ` Greg KH
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=7308e5e9f51501bd92cced8f28ff6130c976b3ed.camel@HansenPartnership.com \
--to=james.bottomley@hansenpartnership.com \
--cc=LinoSanfilippo@gmx.de \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=l.sanfilippo@kunbus.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=stable@vger.kernel.org \
--cc=stefanb@linux.vnet.ibm.com \
/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).