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 <[email protected]>
---
 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


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
tpmdd-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Reply via email to