From: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
To: "Vincent Stehlé"
<vincent.stehle-QFKgK+z4sOrR7s880joybQ@public.gmane.org>
Cc: James Bottomley
<James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk@public.gmane.org>,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Subject: Re: [PATCH linux-next] tmp2: fix an off by one bug
Date: Thu, 23 Mar 2017 20:15:39 +0200 [thread overview]
Message-ID: <20170323181539.y57qjubnciglapep@intel.com> (raw)
In-Reply-To: <20170323154029.27816-1-vincent.stehle-QFKgK+z4sOrR7s880joybQ@public.gmane.org>
On Thu, Mar 23, 2017 at 04:40:29PM +0100, Vincent Stehlé wrote:
> In tpm2_map_to_phandle(), avoid the case where i equals
> ARRAY_SIZE(space->context_tbl) and we then access space->context_tbl[i].
>
> This fixes the following smatch error:
>
> drivers/char/tpm/tpm2-space.c:232 tpm2_map_to_phandle() error: buffer overflow 'space->context_tbl' 3 <= 3
>
> Fixes: 5f6b4fbc12c8fc97 ("tpm: infrastructure for TPM spaces")
> Signed-off-by: Vincent Stehlé <vincent.stehle-QFKgK+z4sOrR7s880joybQ@public.gmane.org>
> Cc: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Cc: James Bottomley <James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk@public.gmane.org>
Hi
Thanks for doing this. I just squashed a fix by Colin Ian King. Anyway,
thank you.
/Jarkko
> ---
>
>
> Hi,
>
> I saw that in Linux next-20170323.
>
> Best regards,
>
> Vincent.
>
>
> drivers/char/tpm/tpm2-space.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c
> index d36d81e07076..009934269514 100644
> --- a/drivers/char/tpm/tpm2-space.c
> +++ b/drivers/char/tpm/tpm2-space.c
> @@ -229,7 +229,7 @@ static bool tpm2_map_to_phandle(struct tpm_space *space, void *handle)
> int i;
>
> i = 0xFFFFFF - (vhandle & 0xFFFFFF);
> - if (i > ARRAY_SIZE(space->context_tbl) || !space->context_tbl[i])
> + if (i >= ARRAY_SIZE(space->context_tbl) || !space->context_tbl[i])
> return false;
>
> phandle = space->context_tbl[i];
> --
> 2.11.0
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
next prev parent reply other threads:[~2017-03-23 18:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 11:07 [PATCH 0/6] in-kernel resource manager Jarkko Sakkinen
[not found] ` <20170208110713.14070-1-jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-02-08 11:07 ` [PATCH 1/6] tpm: validate TPM 2.0 commands Jarkko Sakkinen
2017-02-08 11:07 ` [PATCH 2/6] tpm: export tpm2_flush_context_cmd Jarkko Sakkinen
[not found] ` <20170208110713.14070-3-jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-02-08 17:58 ` Jason Gunthorpe
[not found] ` <20170208175830.GA31571-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-02-10 7:42 ` Jarkko Sakkinen
2017-02-08 11:07 ` [PATCH 3/6] tpm: infrastructure for TPM spaces Jarkko Sakkinen
[not found] ` <20170208110713.14070-4-jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-03-23 15:40 ` [PATCH linux-next] tmp2: fix an off by one bug Vincent Stehlé
[not found] ` <20170323154029.27816-1-vincent.stehle-QFKgK+z4sOrR7s880joybQ@public.gmane.org>
2017-03-23 18:15 ` Jarkko Sakkinen [this message]
2017-02-08 11:07 ` [PATCH 4/6] tpm: split out tpm-dev.c into tpm-dev.c and tpm-common-dev.c Jarkko Sakkinen
2017-02-08 11:07 ` [PATCH 5/6] tpm: expose spaces via a device link /dev/tpms<n> Jarkko Sakkinen
2017-02-08 11:07 ` [PATCH 6/6] tpm2: add session handle context saving and restoring to the space code Jarkko Sakkinen
[not found] ` <20170208110713.14070-7-jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-02-10 8:52 ` Jarkko Sakkinen
[not found] ` <20170210085256.eqhnrmdug2fcz4ql-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-02-10 16:11 ` James Bottomley
2017-02-10 19:07 ` [PATCH 6/6] tpm2: add session handle context saving and restoring to the space code' Jarkko Sakkinen
2017-02-10 12:32 ` [PATCH 6/6] tpm2: add session handle context saving and restoring to the space code Jarkko Sakkinen
[not found] ` <20170210123249.nrppoez2kdr2q4nw-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-02-10 16:17 ` James Bottomley
[not found] ` <1486743431.2502.6.camel-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk@public.gmane.org>
2017-02-10 19:10 ` Jarkko Sakkinen
[not found] ` <20170210191004.yv5hgnd3h5scj5zt-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-02-10 19:12 ` James Bottomley
2017-02-10 22:48 ` [tpmdd-devel] " Jarkko Sakkinen
2017-02-10 8:53 ` [PATCH 0/6] in-kernel resource manager 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=20170323181539.y57qjubnciglapep@intel.com \
--to=jarkko.sakkinen-vuqaysv1563yd54fqh9/ca@public.gmane.org \
--cc=James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk@public.gmane.org \
--cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
--cc=vincent.stehle-QFKgK+z4sOrR7s880joybQ@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).