From: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
To: Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Subject: Re: [PATCH] tpm: do handle area size validation only when TPM space used
Date: Tue, 28 Mar 2017 15:47:30 +0300 [thread overview]
Message-ID: <20170328124730.4adgqyzglbkjksdi@intel.com> (raw)
In-Reply-To: <93b2b783656c400ebea13a9eeec48097-nFblLGNE8XKJSz+rYg/bSJowlv4uC7bZ@public.gmane.org>
On Tue, Mar 28, 2017 at 11:27:53AM +0000, Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org wrote:
> Yes, this fixes the issue for me. Thanks.
>
> Alexander
Great. I will squash this to the infrastructure patch. Thank you.
/Jarkko
> > -----Original Message-----
> > From: Jarkko Sakkinen [mailto:jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org]
> > Sent: Tuesday, March 28, 2017 12:25 PM
> > To: Steffen Alexander (IFAG CCS ESS D SW A)
> > Cc: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org; linux-security-
> > module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Peter Huewe; Marcel Selhorst; Jason Gunthorpe;
> > open list
> > Subject: Re: [PATCH] tpm: do handle area size validation only when TPM
> > space used
> >
> > So do you need this or not?
> >
> > /Jarkko
> >
> > On Mon, Mar 27, 2017 at 12:08:15AM +0300, Jarkko Sakkinen wrote:
> > > In order to not cause backwards compatibility issues with
> > > /dev/tpm0 disable handle area size validation if tpm_transmit is not
> > > called with a TPM space.
> > >
> > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen-X3B1VOXEql0@public.gmane.org>
> > > ---
> > > drivers/char/tpm/tpm-interface.c | 9 +++++++--
> > > 1 file changed, 7 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/char/tpm/tpm-interface.c
> > > b/drivers/char/tpm/tpm-interface.c
> > > index bf0c3fa..158c1db 100644
> > > --- a/drivers/char/tpm/tpm-interface.c
> > > +++ b/drivers/char/tpm/tpm-interface.c
> > > @@ -328,7 +328,9 @@ unsigned long tpm_calc_ordinal_duration(struct
> > > tpm_chip *chip, } EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);
> > >
> > > -static bool tpm_validate_command(struct tpm_chip *chip, const u8
> > > *cmd,
> > > +static bool tpm_validate_command(struct tpm_chip *chip,
> > > + struct tpm_space *space,
> > > + const u8 *cmd,
> > > size_t len)
> > > {
> > > const struct tpm_input_header *header = (const void *)cmd; @@ -
> > 340,6
> > > +342,9 @@ static bool tpm_validate_command(struct tpm_chip *chip,
> > const u8 *cmd,
> > > if (len < TPM_HEADER_SIZE)
> > > return false;
> > >
> > > + if (!space)
> > > + return true;
> > > +
> > > if (chip->flags & TPM_CHIP_FLAG_TPM2 && chip->nr_commands) {
> > > cc = be32_to_cpu(header->ordinal);
> > >
> > > @@ -386,7 +391,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct
> > tpm_space *space,
> > > unsigned long stop;
> > > bool need_locality;
> > >
> > > - if (!tpm_validate_command(chip, buf, bufsiz))
> > > + if (!tpm_validate_command(chip, space, buf, bufsiz))
> > > return -EINVAL;
> > >
> > > if (bufsiz > TPM_BUFSIZE)
> > > --
> > > 2.9.3
> > >
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
prev parent reply other threads:[~2017-03-28 12:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-26 21:08 [PATCH] tpm: do handle area size validation only when TPM space used Jarkko Sakkinen
[not found] ` <20170326210815.21252-1-jarkko.sakkinen-X3B1VOXEql0@public.gmane.org>
2017-03-28 10:24 ` Jarkko Sakkinen
[not found] ` <20170328102453.hvyc3a4vmrk3lyzu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-03-28 11:27 ` Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w
[not found] ` <93b2b783656c400ebea13a9eeec48097-nFblLGNE8XKJSz+rYg/bSJowlv4uC7bZ@public.gmane.org>
2017-03-28 12:47 ` Jarkko Sakkinen [this message]
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=20170328124730.4adgqyzglbkjksdi@intel.com \
--to=jarkko.sakkinen-vuqaysv1563yd54fqh9/ca@public.gmane.org \
--cc=Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.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 read-only IMAP folder(s) and NNTP newsgroup(s).