| Message ID | 1495748360-26558-1-git-send-email-stefanb@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 2017-05-25 at 17:39 -0400, Stefan Berger wrote: > Suppress the error logging when the core TPM driver sends commands > to the VTPM proxy driver and -EPIPE is returned in case the VTPM > proxy driver is 'closed' (closed anonymous file descriptor). This > error code is only returned by the send function and by tpm_transmit > when the VTPM proxy driver is being used. > > Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> > --- > drivers/char/tpm/tpm-interface.c | 4 ++-- > drivers/char/tpm/tpm2-cmd.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index d711186..4826fcf 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -429,11 +429,11 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, > goto out; > > rc = chip->ops->send(chip, (u8 *) buf, count); > - if (rc < 0) { > + if (rc < 0 && rc != -EPIPE) > dev_err(&chip->dev, > "tpm_transmit: tpm_send: error %d\n", rc); > + if (rc < 0) > goto out; Perhaps this would read better as if (rc < 0) { if (rc != -EPIPE) dev_err(etc...); goto out; } though for etc, perhaps dev_err(&chip->dev, "%s: %tpm_send: error %d\n", __func__, rc); -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, May 25, 2017 at 05:39:20PM -0400, Stefan Berger wrote: > Suppress the error logging when the core TPM driver sends commands > to the VTPM proxy driver and -EPIPE is returned in case the VTPM > proxy driver is 'closed' (closed anonymous file descriptor). This > error code is only returned by the send function and by tpm_transmit > when the VTPM proxy driver is being used. > > Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> This have to hold up until some time next week as I have to make sure that I understand that this is the right choice, which requirest to study vtpm implementation. I'm travelling right now. /Jarkko > --- > drivers/char/tpm/tpm-interface.c | 4 ++-- > drivers/char/tpm/tpm2-cmd.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index d711186..4826fcf 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -429,11 +429,11 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, > goto out; > > rc = chip->ops->send(chip, (u8 *) buf, count); > - if (rc < 0) { > + if (rc < 0 && rc != -EPIPE) > dev_err(&chip->dev, > "tpm_transmit: tpm_send: error %d\n", rc); > + if (rc < 0) > goto out; > - } > > if (chip->flags & TPM_CHIP_FLAG_IRQ) > goto out_recv; > diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c > index 3ee6883..3a99643 100644 > --- a/drivers/char/tpm/tpm2-cmd.c > +++ b/drivers/char/tpm/tpm2-cmd.c > @@ -840,7 +840,7 @@ void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type) > /* In places where shutdown command is sent there's no much we can do > * except print the error code on a system failure. > */ > - if (rc < 0) > + if (rc < 0 && rc != -EPIPE) > dev_warn(&chip->dev, "transmit returned %d while stopping the TPM", > rc); > } > -- > 2.4.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index d711186..4826fcf 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -429,11 +429,11 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, goto out; rc = chip->ops->send(chip, (u8 *) buf, count); - if (rc < 0) { + if (rc < 0 && rc != -EPIPE) dev_err(&chip->dev, "tpm_transmit: tpm_send: error %d\n", rc); + if (rc < 0) goto out; - } if (chip->flags & TPM_CHIP_FLAG_IRQ) goto out_recv; diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 3ee6883..3a99643 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -840,7 +840,7 @@ void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type) /* In places where shutdown command is sent there's no much we can do * except print the error code on a system failure. */ - if (rc < 0) + if (rc < 0 && rc != -EPIPE) dev_warn(&chip->dev, "transmit returned %d while stopping the TPM", rc); }
Suppress the error logging when the core TPM driver sends commands to the VTPM proxy driver and -EPIPE is returned in case the VTPM proxy driver is 'closed' (closed anonymous file descriptor). This error code is only returned by the send function and by tpm_transmit when the VTPM proxy driver is being used. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> --- drivers/char/tpm/tpm-interface.c | 4 ++-- drivers/char/tpm/tpm2-cmd.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)