From: Stefan Berger <stefanb@linux.ibm.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
linux-integrity@vger.kernel.org
Cc: 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>,
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 v5 05/17] tpm: print tpm2_commit_space() error inside tpm2_commit_space()
Date: Thu, 8 Nov 2018 09:56:34 -0500 [thread overview]
Message-ID: <32b1c364-2231-a740-8dbb-3cbbff490aca@linux.ibm.com> (raw)
In-Reply-To: <20181108141541.12832-6-jarkko.sakkinen@linux.intel.com>
On 11/8/18 9:15 AM, Jarkko Sakkinen wrote:
> The error logging for tpm2_commit_space() is in a wrong place. This
> commit moves it inside that function.
>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
> drivers/char/tpm/tpm-interface.c | 8 ++------
> drivers/char/tpm/tpm2-space.c | 9 ++++++---
> 2 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index c9efd1b9fd2c..7ffb16edab6f 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -268,14 +268,10 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip,
> rc = -EFAULT;
>
> out_space:
> - if (rc) {
> + if (rc)
> tpm2_flush_space(chip);
> - } else {
> + else
> rc = tpm2_commit_space(chip, space, ordinal, buf, &len);
> - if (rc)
> - dev_err(&chip->dev, "tpm2_commit_space: error %d\n",
> - rc);
> - }
>
> out_idle:
> /* 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 d53c882268ff..3d5f9577e5de 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:
> + dev_err(&chip->dev, "%s: error %d\n", __func__, rc);
> + return rc;
> }
next prev parent reply other threads:[~2018-11-08 14:56 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-08 14:15 [PATCH v5 00/17] Remove nested TPM operations Jarkko Sakkinen
2018-11-08 14:15 ` [PATCH v5 01/17] tpm: use tpm_buf in tpm_transmit_cmd() as the IO parameter Jarkko Sakkinen
2018-11-08 14:15 ` [PATCH v5 02/17] tpm: fix invalid return value in pubek_show() Jarkko Sakkinen
2018-11-08 14:15 ` [PATCH v5 03/17] tpm: return 0 from pcrs_show() when tpm1_pcr_read() fails Jarkko Sakkinen
2018-11-08 14:52 ` Stefan Berger
2018-11-08 14:15 ` [PATCH v5 04/17] tpm: call tpm2_flush_space() on error in tpm_try_transmit() Jarkko Sakkinen
2018-11-08 14:55 ` Stefan Berger
2018-11-08 14:15 ` [PATCH v5 05/17] tpm: print tpm2_commit_space() error inside tpm2_commit_space() Jarkko Sakkinen
2018-11-08 14:56 ` Stefan Berger [this message]
2018-11-08 14:15 ` [PATCH v5 06/17] tpm: clean up tpm_try_transmit() error handling flow Jarkko Sakkinen
2018-11-08 14:59 ` Stefan Berger
2018-11-08 14:15 ` [PATCH v5 07/17] tpm: declare struct tpm_header Jarkko Sakkinen
2018-11-08 15:02 ` Stefan Berger
2018-11-08 14:15 ` [PATCH v5 08/17] tpm: access command header through struct in tpm_try_transmit() Jarkko Sakkinen
2018-11-08 15:03 ` Stefan Berger
2018-11-08 14:15 ` [PATCH v5 09/17] tpm: move tpm_validate_commmand() to tpm2-space.c Jarkko Sakkinen
2018-11-08 17:03 ` Winkler, Tomas
2018-11-08 23:07 ` Jarkko Sakkinen
2018-11-08 14:15 ` [PATCH v5 10/17] tpm: encapsulate tpm_dev_transmit() Jarkko Sakkinen
2018-11-08 14:15 ` [PATCH v5 11/17] tpm: move TPM space code out of tpm_transmit() Jarkko Sakkinen
2018-11-08 15:16 ` Stefan Berger
2018-11-08 18:58 ` Jarkko Sakkinen
2018-11-08 14:15 ` [PATCH v5 12/17] tpm: remove @space from tpm_transmit() Jarkko Sakkinen
2018-11-08 15:18 ` Stefan Berger
2018-11-08 14:15 ` [PATCH v5 13/17] tpm: use tpm_try_get_ops() in tpm-sysfs.c Jarkko Sakkinen
2018-11-08 15:26 ` Stefan Berger
2018-11-08 14:15 ` [PATCH v5 14/17] tpm: remove TPM_TRANSMIT_UNLOCKED flag Jarkko Sakkinen
2018-11-08 15:43 ` Stefan Berger
2018-11-08 19:02 ` Jarkko Sakkinen
2018-11-08 14:15 ` [PATCH v5 15/17] tpm: introduce tpm_chip_start() and tpm_chip_stop() Jarkko Sakkinen
2018-11-08 14:15 ` [PATCH v5 16/17] tpm: take TPM chip power gating out of tpm_transmit() Jarkko Sakkinen
2018-11-08 18:38 ` Winkler, Tomas
2018-11-08 23:07 ` Jarkko Sakkinen
2018-11-09 21:37 ` Winkler, Tomas
2018-11-13 11:12 ` Jarkko Sakkinen
2018-11-13 11:58 ` Winkler, Tomas
2018-11-13 15:52 ` Jarkko Sakkinen
2018-11-08 14:15 ` [PATCH v5 17/17] tpm: remove @flags from tpm_transmit() 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=32b1c364-2231-a740-8dbb-3cbbff490aca@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jarkko.sakkinen@linux.intel.com \
--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).