From: "Winkler, Tomas" <tomas.winkler@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: "linux-integrity@vger.kernel.org"
<linux-integrity@vger.kernel.org>,
"linux-security-module@vger.kernel.org"
<linux-security-module@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
James Morris <jmorris@namei.org>,
Jerry Snitselaar <jsnitsel@redhat.com>
Subject: RE: [PATCH] tpm/tpm_crb: Avoid unaligned reads in crb_recv():
Date: Fri, 1 Feb 2019 19:20:42 +0000 [thread overview]
Message-ID: <5B8DA87D05A7694D9FA63FD143655C1B9DA8E215@hasmsx108.ger.corp.intel.com> (raw)
In-Reply-To: <20190201111949.14881-1-jarkko.sakkinen@linux.intel.com>
>
> The current approach to read first 6 bytes from the response and then tail of
> the response, can cause the 2nd memcpy_fromio() to do an unaligned read
> (e.g. read 32-bit word from address aligned to a 16-bits), depending on how
> memcpy_fromio() is implemented. If this happens, the read will fail and the
> memory controller will fill the read with 1's.
>
> This was triggered by 170d13ca3a2f, which should be probably refined to check
> and react to the address alignment. Before that commit, on x86
> memcpy_fromio() turned out to be memcpy(). By a luck GCC has done the right
> thing (from tpm_crb's perspective) for us so far, but we should not rely on that.
> Thus, it makes sense to fix this also in tpm_crb, not least because the fix can be
> then backported to stable kernels and make them more robust when compiled
> in differing environments.
>
> Cc: stable@vger.kernel.org
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: James Morris <jmorris@namei.org>
> Cc: Tomas Winkler <tomas.winkler@intel.com>
> Cc: Jerry Snitselaar <jsnitsel@redhat.com>
> Fixes: 30fc8d138e91 ("tpm: TPM 2.0 CRB Interface")
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> ---
> drivers/char/tpm/tpm_crb.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index
> 36952ef98f90..7f47e43aa9f1 100644
> --- a/drivers/char/tpm/tpm_crb.c
> +++ b/drivers/char/tpm/tpm_crb.c
> @@ -288,18 +288,18 @@ static int crb_recv(struct tpm_chip *chip, u8 *buf,
> size_t count)
> unsigned int expected;
>
> /* sanity check */
> - if (count < 6)
> + if (count < 8)
> return -EIO;
Why don't you already enforce reading at least the whole TPM header 10bytes, we are reading the whole buffer at one call anyway.
Who every is asking for 8 bytes from the protocol level, is doing something wrong.
> if (ioread32(&priv->regs_t->ctrl_sts) & CRB_CTRL_STS_ERROR)
> return -EIO;
>
> - memcpy_fromio(buf, priv->rsp, 6);
> + memcpy_fromio(buf, priv->rsp, 8);
Maybe a short comment will spare someone looking into git history
> expected = be32_to_cpup((__be32 *) &buf[2]);
> - if (expected > count || expected < 6)
> + if (expected > count || expected < 8)
Expected should be at least tpm header, right?
> return -EIO;
>
> - memcpy_fromio(&buf[6], &priv->rsp[6], expected - 6);
> + memcpy_fromio(&buf[8], &priv->rsp[8], expected - 8);
>
> return expected;
> }
Otherwise ready the first 8 bytes looks good.
Thanks
Tomas
next prev parent reply other threads:[~2019-02-01 19:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-01 11:19 [PATCH] tpm/tpm_crb: Avoid unaligned reads in crb_recv(): Jarkko Sakkinen
2019-02-01 17:49 ` Linus Torvalds
2019-02-04 11:47 ` Jarkko Sakkinen
2019-02-01 18:42 ` Jerry Snitselaar
2019-02-01 19:20 ` Winkler, Tomas [this message]
2019-02-04 11:44 ` Jarkko Sakkinen
2019-02-04 12:17 ` David Laight
2019-02-05 10:44 ` Jarkko Sakkinen
2019-02-05 10:47 ` Jarkko Sakkinen
2019-02-05 10:49 ` 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=5B8DA87D05A7694D9FA63FD143655C1B9DA8E215@hasmsx108.ger.corp.intel.com \
--to=tomas.winkler@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jmorris@namei.org \
--cc=jsnitsel@redhat.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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).