From: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Thierry Reding
<thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Mikko Perttunen <cyndis-/1wQRMveznE@public.gmane.org>
Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
DRI Development
<dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>,
Erik Faye-Lund
<kusmabite-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH] drm/tegra: Check whether page belongs to BO in tegra_bo_kmap()
Date: Sun, 14 May 2017 23:47:32 +0300 [thread overview]
Message-ID: <20170514204734.22130-2-digetx@gmail.com> (raw)
In-Reply-To: <20170514204734.22130-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
This fixes an OOPS in case of out-of-bounds accessing of a kmap'ed commands
buffer CMA while patching relocations in do_relocs().
Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/gpu/drm/tegra/gem.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 424569b53e57..b76d7ac75696 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -74,6 +74,9 @@ static void *tegra_bo_kmap(struct host1x_bo *bo, unsigned int page)
{
struct tegra_bo *obj = host1x_to_tegra_bo(bo);
+ if (page * PAGE_SIZE > obj->gem.size)
+ return NULL;
+
if (obj->vaddr)
return obj->vaddr + page * PAGE_SIZE;
else if (obj->gem.import_attach)
--
2.13.0
next prev parent reply other threads:[~2017-05-14 20:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-14 20:47 [PATCH] gpu: host1x: Do not leak BO's phys address to userspace Dmitry Osipenko
[not found] ` <20170514204734.22130-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-14 20:47 ` Dmitry Osipenko [this message]
[not found] ` <20170514204734.22130-2-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-15 7:54 ` [PATCH] drm/tegra: Check whether page belongs to BO in tegra_bo_kmap() Dmitry Osipenko
2017-05-14 20:47 ` [PATCH] drm/tegra: Check offsets of a submitted command buffer and of relocations Dmitry Osipenko
[not found] ` <20170514204734.22130-3-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-15 8:01 ` Dmitry Osipenko
2017-05-16 6:56 ` Mikko Perttunen
[not found] ` <3db57134-4dba-e886-059c-96034192f637-/1wQRMveznE@public.gmane.org>
2017-05-16 7:32 ` Erik Faye-Lund
[not found] ` <CABPQNSYgayogP1MCTj5O4UNFrsWr5e5F9e8E0wHMU0bieW+Ocw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-16 8:10 ` Mikko Perttunen
[not found] ` <2fa29660-8982-7caa-065c-b04e2fd2a8b6-/1wQRMveznE@public.gmane.org>
2017-05-16 8:56 ` Dmitry Osipenko
2017-05-16 8:11 ` Dmitry Osipenko
2017-05-14 20:47 ` [PATCH v2] drm/tegra: Correct idr_alloc() minimum id Dmitry Osipenko
[not found] ` <20170514204734.22130-4-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-16 8:11 ` Mikko Perttunen
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=20170514204734.22130-2-digetx@gmail.com \
--to=digetx-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=cyndis-/1wQRMveznE@public.gmane.org \
--cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=kusmabite-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.