From: Randy Dunlap <rdunlap@infradead.org>
To: Etienne Carriere <etienne.carriere@linaro.org>,
linux-kernel@vger.kernel.org,
Jens Wiklander <jens.wiklander@linaro.org>,
Alexandre Jutras <alexandre.jutras@nxp.com>
Subject: Re: [PATCH] tee: check shm references are consistent in offset/size
Date: Fri, 27 Apr 2018 08:58:29 -0700 [thread overview]
Message-ID: <4b24ee15-4366-279b-45bd-e8b2f4325ab2@infradead.org> (raw)
In-Reply-To: <CAN5uoS_GfCgWCc7QLPhtYkRzXfV+5Xy-TJobC7-NopQe5MGwMw@mail.gmail.com>
On 04/27/2018 06:53 AM, Etienne Carriere wrote:
> This change prevents userland from referencing TEE shared memory
> outside the area initially allocated by its owner. Prior this change an
> application could not reference or access memory it did not own but
> it could reference memory not explicitly allocated by owner.
>
> Reported-by: Alexandre Jutras <alexandre.jutras@nxp.com>
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
>
> ---
> drivers/tee/tee_core.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
> index 0124a91..dd46b75 100644
> --- a/drivers/tee/tee_core.c
> +++ b/drivers/tee/tee_core.c
> @@ -238,6 +238,17 @@ static int params_from_user(struct tee_context
> *ctx, struct tee_param *params,
Those 2 lines above should be only one line.
> if (IS_ERR(shm))
> return PTR_ERR(shm);
>
> + /*
> + * Ensure offset + size does not overflow offset
> + * and does not overflow the size of the referred
> + * shared memory object.
> + */
> + if ((ip.a + ip.b) < ip.a ||
> + (ip.a + ip.b) > shm->size) {
> + tee_shm_put(shm);
> + return -EINVAL;
> + }
> +
Hi,
The patch makes sense but the whitespace and indentation are all mucked up.
Could be your email client.
Please check/fix and test by emailing it to yourself.
> params[n].u.memref.shm_offs = ip.a;
> params[n].u.memref.size = ip.b;
> params[n].u.memref.shm = shm;
>
thanks,
--
~Randy
next prev parent reply other threads:[~2018-04-27 15:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-27 13:53 Etienne Carriere
2018-04-27 15:58 ` Randy Dunlap [this message]
2018-04-29 12:22 Etienne Carriere
2018-05-07 8:24 ` Jens Wiklander
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=4b24ee15-4366-279b-45bd-e8b2f4325ab2@infradead.org \
--to=rdunlap@infradead.org \
--cc=alexandre.jutras@nxp.com \
--cc=etienne.carriere@linaro.org \
--cc=jens.wiklander@linaro.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®