lkml.org 
[lkml]   [2020]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 6/8] tpm: tpm_tis: verify TPM_STS register is valid after locality request
    Date
    From: Amir Mizinski <amirmizi6@gmail.com>

    Issue could result when the TPM does not update TPM_STS register after
    a locality request (TPM_STS Initial value = 0xFF) and a TPM_STS register
    read occurs (tpm_tis_status(chip)).

    Checking the next condition("if ((status & TPM_STS_COMMAND_READY) == 0)"),
    the status will be at 0xFF and will be considered, wrongly, in "Ready"
    state (by checking only one bit). However, at this moment the TPM is, in
    fact, in "Idle" state and remains in "Idle" state because
    "tpm_tis_ready(chip);" was not executed.

    Suggested-by: Benoit Houyere <benoit.houyere@st.com>
    Signed-off-by: Amir Mizinski <amirmizi6@gmail.com>
    ---
    drivers/char/tpm/tpm_tis_core.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
    index 9d90b9a..8868fe0 100644
    --- a/drivers/char/tpm/tpm_tis_core.c
    +++ b/drivers/char/tpm/tpm_tis_core.c
    @@ -221,8 +221,14 @@ static int request_locality(struct tpm_chip *chip, int l)
    } else {
    /* wait for burstcount */
    do {
    - if (check_locality(chip, l))
    + if (check_locality(chip, l)) {
    + if (wait_for_tpm_stat(chip, TPM_STS_GO, 0,
    + chip->timeout_c,
    + &priv->int_queue,
    + false) < 0)
    + return -ETIME;
    return l;
    + }
    tpm_msleep(TPM_TIMEOUT);
    } while (time_before(jiffies, stop));
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2020-06-04 15:49    [W:3.654 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site