From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: "Winkler, Tomas" <tomas.winkler@intel.com>
Cc: "linux-integrity@vger.kernel.org"
<linux-integrity@vger.kernel.org>,
"linux-security-module@vger.kernel.org"
<linux-security-module@vger.kernel.org>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
"Struk, Tadeusz" <tadeusz.struk@intel.com>,
Stefan Berger <stefanb@linux.vnet.ibm.com>,
Nayna Jain <nayna@linux.ibm.com>, Peter Huewe <peterhuewe@gmx.de>,
Jason Gunthorpe <jgg@ziepe.ca>, Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v9 04/17] tpm: print tpm2_commit_space() error inside tpm2_commit_space()
Date: Tue, 20 Nov 2018 14:49:13 +0200 [thread overview]
Message-ID: <20181120124913.GC8813@linux.intel.com> (raw)
In-Reply-To: <5B8DA87D05A7694D9FA63FD143655C1B9DA23561@hasmsx108.ger.corp.intel.com>
On Mon, Nov 19, 2018 at 09:25:22PM +0000, Winkler, Tomas wrote:
>
>
> >
> > The error logging for tpm2_commit_space() is in a wrong place. This commit
> > moves it inside that function.
> >
> > Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
> > ---
> > drivers/char/tpm/tpm-interface.c | 2 --
> > drivers/char/tpm/tpm2-space.c | 9 ++++++---
> > 2 files changed, 6 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-
> > interface.c
> > index 64510ed81b46..7ac6ada8428c 100644
> > --- a/drivers/char/tpm/tpm-interface.c
> > +++ b/drivers/char/tpm/tpm-interface.c
> > @@ -277,8 +277,6 @@ static ssize_t tpm_try_transmit(struct tpm_chip
> > *chip,
> > }
> >
> > rc = tpm2_commit_space(chip, space, ordinal, buf, &len);
> > - if (rc)
> > - dev_err(&chip->dev, "tpm2_commit_space: error %d\n", rc);
> >
> > out:
> > /* may fail but do not override previous error value in rc */ diff --git
> > a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c index
> > 1131a8e7b79b..5ecc73988f7c 100644
> > --- a/drivers/char/tpm/tpm2-space.c
> > +++ b/drivers/char/tpm/tpm2-space.c
> > @@ -501,19 +501,19 @@ int tpm2_commit_space(struct tpm_chip *chip,
> > struct tpm_space *space,
> > rc = tpm2_map_response_header(chip, cc, buf, *bufsiz);
> > if (rc) {
> > tpm2_flush_space(chip);
> > - return rc;
> > + goto out;
> > }
> >
> > rc = tpm2_map_response_body(chip, cc, buf, *bufsiz);
> > if (rc) {
> > tpm2_flush_space(chip);
> > - return rc;
> > + goto out;
> > }
> >
> > rc = tpm2_save_space(chip);
> > if (rc) {
> > tpm2_flush_space(chip);
> > - return rc;
> > + goto out;
> > }
> >
> > *bufsiz = be32_to_cpu(header->length); @@ -526,4 +526,7 @@ int
> > tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space,
> > memcpy(space->session_buf, chip->work_space.session_buf,
> > PAGE_SIZE);
> >
> > return 0;
> > +out:
> Maybe 'out' is too positive name for an error-only exit point?
> or you can use if (rc) ... dev_err()
out_err?
/Jarkko
next prev parent reply other threads:[~2018-11-20 12:49 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 [this message]
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
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=20181120124913.GC8813@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).