From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Jason Gunthorpe <jgg@ziepe.ca>
Cc: linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Tomas Winkler <tomas.winkler@intel.com>,
Tadeusz Struk <tadeusz.struk@intel.com>,
Stefan Berger <stefanb@linux.vnet.ibm.com>,
Nayna Jain <nayna@linux.ibm.com>, Peter Huewe <peterhuewe@gmx.de>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v9 14/17] tpm: remove TPM_TRANSMIT_UNLOCKED flag
Date: Mon, 19 Nov 2018 14:38:44 +0200 [thread overview]
Message-ID: <20181119123844.GA8755@linux.intel.com> (raw)
In-Reply-To: <20181118195104.GA21938@ziepe.ca>
On Sun, Nov 18, 2018 at 12:51:04PM -0700, Jason Gunthorpe wrote:
> On Sun, Nov 18, 2018 at 02:47:47PM +0200, Jarkko Sakkinen wrote:
> > Added locking as part of tpm_try_get_ops() and tpm_put_ops() as they are
> > anyway used in most of the call sites except in tpmrm_release() where we
> > take the locks manually.
> >
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
> > ---
> > drivers/char/tpm/tpm-chip.c | 2 ++
> > drivers/char/tpm/tpm-dev-common.c | 4 +---
> > drivers/char/tpm/tpm-interface.c | 8 --------
> > drivers/char/tpm/tpm.h | 8 ++------
> > drivers/char/tpm/tpm2-cmd.c | 13 ++++---------
> > drivers/char/tpm/tpm2-space.c | 15 ++++++---------
> > 6 files changed, 15 insertions(+), 35 deletions(-)
>
> > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> > index 32db84683c40..157505b0f755 100644
> > --- a/drivers/char/tpm/tpm-chip.c
> > +++ b/drivers/char/tpm/tpm-chip.c
> > @@ -58,6 +58,7 @@ int tpm_try_get_ops(struct tpm_chip *chip)
> > if (!chip->ops)
> > goto out_lock;
> >
> > + mutex_lock(&chip->tpm_mutex);
> > return 0;
>
> It really isn't appropriate for something called 'get' to be exclusive
> like this.. Call it tpm_try_lock_ops() ?
Would definitely be appropriate to rename it, yes.
> > diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c
> > index c7dc54930576..582caefcf19b 100644
> > --- a/drivers/char/tpm/tpm-dev-common.c
> > +++ b/drivers/char/tpm/tpm-dev-common.c
> > @@ -33,7 +33,6 @@ static ssize_t tpm_dev_transmit(struct tpm_chip *chip, struct tpm_space *space,
> > struct tpm_header *header = (void *)buf;
> > ssize_t ret, len;
> >
> > - mutex_lock(&chip->tpm_mutex);
>
> The now implicit locking should be tested for using lockdep calls in
> all places that assume the lock is held by the caller.
Yes. Most importantly trusted keys and IMA should be tested with lockdep
turned on.
/Jarkko
next prev parent reply other threads:[~2018-11-19 12:38 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-18 12:47 [PATCH v9 00/17] Removed nested TPM operations Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 01/17] tpm: use tpm_buf in tpm_transmit_cmd() as the IO parameter Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 02/17] tpm: fix invalid return value in pubek_show() Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 03/17] tpm: return 0 from pcrs_show() when tpm1_pcr_read() fails Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 04/17] tpm: print tpm2_commit_space() error inside tpm2_commit_space() Jarkko Sakkinen
2018-11-19 21:25 ` Winkler, Tomas
2018-11-20 12:49 ` Jarkko Sakkinen
2018-11-20 13:12 ` Winkler, Tomas
2018-11-18 12:47 ` [PATCH v9 05/17] tpm: declare struct tpm_header Jarkko Sakkinen
2018-11-19 21:33 ` Winkler, Tomas
2018-11-20 13:08 ` Jarkko Sakkinen
2018-11-20 16:01 ` Jason Gunthorpe
2018-11-20 22:50 ` Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 06/17] tpm: access command header through struct in tpm_try_transmit() Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 07/17] tpm: encapsulate tpm_dev_transmit() Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 08/17] tpm: call tpm2_flush_space() on error in tpm_try_transmit() Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 09/17] tpm: clean up tpm_try_transmit() error handling flow Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 10/17] tpm: move tpm_validate_commmand() to tpm2-space.c Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 11/17] tpm: move TPM space code out of tpm_transmit() Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 12/17] tpm: remove @space from tpm_transmit() Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 13/17] tpm: use tpm_try_get_ops() in tpm-sysfs.c Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 14/17] tpm: remove TPM_TRANSMIT_UNLOCKED flag Jarkko Sakkinen
2018-11-18 19:51 ` Jason Gunthorpe
2018-11-19 12:38 ` Jarkko Sakkinen [this message]
2018-11-18 12:47 ` [PATCH v9 15/17] tpm: introduce tpm_chip_start() and tpm_chip_stop() Jarkko Sakkinen
2018-11-19 14:13 ` Stefan Berger
2018-11-19 15:50 ` Jarkko Sakkinen
2018-11-18 12:47 ` [PATCH v9 16/17] tpm: take TPM chip power gating out of tpm_transmit() Jarkko Sakkinen
2018-11-18 22:52 ` Winkler, Tomas
2018-11-19 12:48 ` Jarkko Sakkinen
2018-11-19 13:17 ` Winkler, Tomas
2018-11-19 15:55 ` Jarkko Sakkinen
2018-11-19 14:15 ` Stefan Berger
2018-11-18 12:47 ` [PATCH v9 17/17] tpm: remove @flags from tpm_transmit() Jarkko Sakkinen
2018-11-19 14:23 ` [PATCH v9 00/17] Removed nested TPM operations Stefan Berger
2018-11-19 15:56 ` Jarkko Sakkinen
2018-11-27 23:41 ` 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=20181119123844.GA8755@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=nayna@linux.ibm.com \
--cc=peterhuewe@gmx.de \
--cc=stefanb@linux.vnet.ibm.com \
--cc=tadeusz.struk@intel.com \
--cc=tomas.winkler@intel.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).