lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 261/280] tpm: Unify the send callback behaviour
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

    commit f5595f5baa30e009bf54d0d7653a9a0cc465be60 upstream.

    The send() callback should never return length as it does not in every
    driver except tpm_crb in the success case. The reason is that the main
    transmit functionality only cares about whether the transmit was
    successful or not and ignores the count completely.

    Suggested-by: Stefan Berger <stefanb@linux.ibm.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
    Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
    Tested-by: Alexander Steffen <Alexander.Steffen@infineon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/char/tpm/st33zp24/st33zp24.c | 2 +-
    drivers/char/tpm/tpm-interface.c | 11 ++++++++++-
    drivers/char/tpm/tpm_atmel.c | 2 +-
    drivers/char/tpm/tpm_i2c_atmel.c | 6 +++++-
    drivers/char/tpm/tpm_i2c_infineon.c | 2 +-
    drivers/char/tpm/tpm_i2c_nuvoton.c | 2 +-
    drivers/char/tpm/tpm_ibmvtpm.c | 8 ++++----
    drivers/char/tpm/tpm_infineon.c | 2 +-
    drivers/char/tpm/tpm_nsc.c | 2 +-
    drivers/char/tpm/tpm_tis_core.c | 2 +-
    drivers/char/tpm/tpm_vtpm_proxy.c | 3 +--
    drivers/char/tpm/xen-tpmfront.c | 2 +-
    12 files changed, 28 insertions(+), 16 deletions(-)

    --- a/drivers/char/tpm/st33zp24/st33zp24.c
    +++ b/drivers/char/tpm/st33zp24/st33zp24.c
    @@ -436,7 +436,7 @@ static int st33zp24_send(struct tpm_chip
    goto out_err;
    }

    - return len;
    + return 0;
    out_err:
    st33zp24_cancel(chip);
    release_locality(chip);
    --- a/drivers/char/tpm/tpm-interface.c
    +++ b/drivers/char/tpm/tpm-interface.c
    @@ -495,10 +495,19 @@ static ssize_t tpm_try_transmit(struct t
    if (rc < 0) {
    if (rc != -EPIPE)
    dev_err(&chip->dev,
    - "%s: tpm_send: error %d\n", __func__, rc);
    + "%s: send(): error %d\n", __func__, rc);
    goto out;
    }

    + /* A sanity check. send() should just return zero on success e.g.
    + * not the command length.
    + */
    + if (rc > 0) {
    + dev_warn(&chip->dev,
    + "%s: send(): invalid value %d\n", __func__, rc);
    + rc = 0;
    + }
    +
    if (chip->flags & TPM_CHIP_FLAG_IRQ)
    goto out_recv;

    --- a/drivers/char/tpm/tpm_atmel.c
    +++ b/drivers/char/tpm/tpm_atmel.c
    @@ -105,7 +105,7 @@ static int tpm_atml_send(struct tpm_chip
    iowrite8(buf[i], priv->iobase);
    }

    - return count;
    + return 0;
    }

    static void tpm_atml_cancel(struct tpm_chip *chip)
    --- a/drivers/char/tpm/tpm_i2c_atmel.c
    +++ b/drivers/char/tpm/tpm_i2c_atmel.c
    @@ -65,7 +65,11 @@ static int i2c_atmel_send(struct tpm_chi
    dev_dbg(&chip->dev,
    "%s(buf=%*ph len=%0zx) -> sts=%d\n", __func__,
    (int)min_t(size_t, 64, len), buf, len, status);
    - return status;
    +
    + if (status < 0)
    + return status;
    +
    + return 0;
    }

    static int i2c_atmel_recv(struct tpm_chip *chip, u8 *buf, size_t count)
    --- a/drivers/char/tpm/tpm_i2c_infineon.c
    +++ b/drivers/char/tpm/tpm_i2c_infineon.c
    @@ -587,7 +587,7 @@ static int tpm_tis_i2c_send(struct tpm_c
    /* go and do it */
    iic_tpm_write(TPM_STS(tpm_dev.locality), &sts, 1);

    - return len;
    + return 0;
    out_err:
    tpm_tis_i2c_ready(chip);
    /* The TPM needs some time to clean up here,
    --- a/drivers/char/tpm/tpm_i2c_nuvoton.c
    +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
    @@ -469,7 +469,7 @@ static int i2c_nuvoton_send(struct tpm_c
    }

    dev_dbg(dev, "%s() -> %zd\n", __func__, len);
    - return len;
    + return 0;
    }

    static bool i2c_nuvoton_req_canceled(struct tpm_chip *chip, u8 status)
    --- a/drivers/char/tpm/tpm_ibmvtpm.c
    +++ b/drivers/char/tpm/tpm_ibmvtpm.c
    @@ -141,14 +141,14 @@ static int tpm_ibmvtpm_recv(struct tpm_c
    }

    /**
    - * tpm_ibmvtpm_send - Send tpm request
    - *
    + * tpm_ibmvtpm_send() - Send a TPM command
    * @chip: tpm chip struct
    * @buf: buffer contains data to send
    * @count: size of buffer
    *
    * Return:
    - * Number of bytes sent or < 0 on error.
    + * 0 on success,
    + * -errno on error
    */
    static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)
    {
    @@ -194,7 +194,7 @@ static int tpm_ibmvtpm_send(struct tpm_c
    rc = 0;
    ibmvtpm->tpm_processing_cmd = false;
    } else
    - rc = count;
    + rc = 0;

    spin_unlock(&ibmvtpm->rtce_lock);
    return rc;
    --- a/drivers/char/tpm/tpm_infineon.c
    +++ b/drivers/char/tpm/tpm_infineon.c
    @@ -354,7 +354,7 @@ static int tpm_inf_send(struct tpm_chip
    for (i = 0; i < count; i++) {
    wait_and_send(chip, buf[i]);
    }
    - return count;
    + return 0;
    }

    static void tpm_inf_cancel(struct tpm_chip *chip)
    --- a/drivers/char/tpm/tpm_nsc.c
    +++ b/drivers/char/tpm/tpm_nsc.c
    @@ -226,7 +226,7 @@ static int tpm_nsc_send(struct tpm_chip
    }
    outb(NSC_COMMAND_EOC, priv->base + NSC_COMMAND);

    - return count;
    + return 0;
    }

    static void tpm_nsc_cancel(struct tpm_chip *chip)
    --- a/drivers/char/tpm/tpm_tis_core.c
    +++ b/drivers/char/tpm/tpm_tis_core.c
    @@ -485,7 +485,7 @@ static int tpm_tis_send_main(struct tpm_
    goto out_err;
    }
    }
    - return len;
    + return 0;
    out_err:
    tpm_tis_ready(chip);
    return rc;
    --- a/drivers/char/tpm/tpm_vtpm_proxy.c
    +++ b/drivers/char/tpm/tpm_vtpm_proxy.c
    @@ -335,7 +335,6 @@ static int vtpm_proxy_is_driver_command(
    static int vtpm_proxy_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t count)
    {
    struct proxy_dev *proxy_dev = dev_get_drvdata(&chip->dev);
    - int rc = 0;

    if (count > sizeof(proxy_dev->buffer)) {
    dev_err(&chip->dev,
    @@ -366,7 +365,7 @@ static int vtpm_proxy_tpm_op_send(struct

    wake_up_interruptible(&proxy_dev->wq);

    - return rc;
    + return 0;
    }

    static void vtpm_proxy_tpm_op_cancel(struct tpm_chip *chip)
    --- a/drivers/char/tpm/xen-tpmfront.c
    +++ b/drivers/char/tpm/xen-tpmfront.c
    @@ -173,7 +173,7 @@ static int vtpm_send(struct tpm_chip *ch
    return -ETIME;
    }

    - return count;
    + return 0;
    }

    static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count)

    \
     
     \ /
      Last update: 2019-03-22 13:39    [W:2.699 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site