From: amirmizi6@gmail.com
To: Eyal.Cohen@nuvoton.com, jarkko.sakkinen@linux.intel.com,
oshrialkoby85@gmail.com, alexander.steffen@infineon.com,
robh+dt@kernel.org,
"benoit.houyere@st.com--to=mark.rutland"@arm.com,
peterhuewe@gmx.de, christophe-h.richard@st.com, jgg@ziepe.ca,
arnd@arndb.de, gregkh@linuxfoundation.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-integrity@vger.kernel.org, oshri.alkoby@nuvoton.com,
tmaimon77@gmail.com, gcwilson@us.ibm.com, kgoldman@us.ibm.com,
Dan.Morav@nuvoton.com, oren.tanami@nuvoton.com,
shmulik.hager@nuvoton.com, amir.mizinski@nuvoton.com,
Amir Mizinski <amirmizi6@gmail.com>,
Benoit Houyere <benoit.houyere@st.com>
Subject: [PATCH v11 6/8] tpm: tpm_tis: verify TPM_STS register is valid after locality request
Date: Thu, 18 Jun 2020 16:43:41 +0300 [thread overview]
Message-ID: <20200618134344.243537-7-amirmizi6@gmail.com> (raw)
In-Reply-To: <20200618134344.243537-1-amirmizi6@gmail.com>
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 2636ec7..fd485d2 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
next prev parent reply other threads:[~2020-06-18 13:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-18 13:43 [PATCH v11 0/8] Add tpm i2c ptp driver amirmizi6
2020-06-18 13:43 ` [PATCH v11 1/8] tpm: Make read{16, 32}() and write32() in tpm_tis_phy_ops optional amirmizi6
2020-06-18 13:43 ` [PATCH v11 2/8] tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception amirmizi6
2020-06-22 21:54 ` Jarkko Sakkinen
2020-06-18 13:43 ` [PATCH v11 3/8] tpm: tpm_tis: Add retry in case of protocol failure or data integrity (on I2C only) failure amirmizi6
2020-06-22 21:59 ` Jarkko Sakkinen
2020-06-22 22:02 ` Jarkko Sakkinen
2020-06-18 13:43 ` [PATCH v11 4/8] tpm: tpm_tis: Rewrite "tpm_tis_req_canceled()" amirmizi6
2020-06-18 13:43 ` [PATCH v11 5/8] tpm: Handle an exception for TPM Firmware Update mode amirmizi6
2020-06-18 13:43 ` amirmizi6 [this message]
2020-06-18 13:43 ` [PATCH v11 7/8] tpm: Add YAML schema for TPM TIS I2C options amirmizi6
2020-06-18 13:43 ` [PATCH v11 8/8] tpm: tpm_tis: add tpm_tis_i2c driver amirmizi6
2020-06-22 21:49 ` [PATCH v11 0/8] Add tpm i2c ptp driver 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=20200618134344.243537-7-amirmizi6@gmail.com \
--to=amirmizi6@gmail.com \
--cc="benoit.houyere@st.com--to=mark.rutland"@arm.com \
--cc=Dan.Morav@nuvoton.com \
--cc=Eyal.Cohen@nuvoton.com \
--cc=alexander.steffen@infineon.com \
--cc=amir.mizinski@nuvoton.com \
--cc=arnd@arndb.de \
--cc=benoit.houyere@st.com \
--cc=christophe-h.richard@st.com \
--cc=devicetree@vger.kernel.org \
--cc=gcwilson@us.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=kgoldman@us.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oren.tanami@nuvoton.com \
--cc=oshri.alkoby@nuvoton.com \
--cc=oshrialkoby85@gmail.com \
--cc=peterhuewe@gmx.de \
--cc=robh+dt@kernel.org \
--cc=shmulik.hager@nuvoton.com \
--cc=tmaimon77@gmail.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).