From: Ben Skeggs <skeggsb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Emil Velikov <emil.l.velikov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: Re: [PATCH] drm/nouveau/pm: Prevent overflow in nouveau_perf_init()
Date: Thu, 16 Jun 2011 13:43:59 +1000 [thread overview]
Message-ID: <1308195843.3446.0.camel@nisroch> (raw)
In-Reply-To: <1307795432-5417-1-git-send-email-emil.l.velikov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
On Sat, 2011-06-11 at 13:30 +0100, Emil Velikov wrote:
> While parsing the perf table, there is no check if
> the num of entries read from the vbios is less than
> the currently allocated number.
>
> In case of a buggy vbios this will cause overwriting
> of kernel memory, causing aditional problems.
>
> Add a simple check in order to prevent the case
I've pushed this. I'm not entirely certain we shouldn't just bail out
completely if this is the case, I suspect that if there's this many, the
VBIOS image is probably very screwed.
This'll do for now :)
Ben.
>
> Signed-off-by: Emil Velikov <emil.l.velikov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> drivers/gpu/drm/nouveau/nouveau_perf.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c
> index f2d98c9..b0e995f 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_perf.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c
> @@ -225,6 +225,11 @@ nouveau_perf_init(struct drm_device *dev)
> entries = perf[2];
> }
>
> + if (entries > NOUVEAU_PM_MAX_LEVEL) {
> + NV_DEBUG(dev, "perf table has too many entries - buggy vbios?\n");
> + entries = NOUVEAU_PM_MAX_LEVEL;
> + }
> +
> entry = perf + headerlen;
> for (i = 0; i < entries; i++) {
> struct nouveau_pm_level *perflvl = &pm->perflvl[pm->nr_perflvl];
next prev parent reply other threads:[~2011-06-16 3:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-11 12:30 [PATCH] drm/nouveau/pm: Prevent overflow in nouveau_perf_init() Emil Velikov
[not found] ` <1307795432-5417-1-git-send-email-emil.l.velikov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-06-11 14:20 ` Martin Peres
2011-06-16 3:43 ` Ben Skeggs [this message]
2011-06-16 22:40 ` Emil Velikov
2011-06-17 0:14 ` Ben Skeggs
2011-06-18 20:19 ` Emil Velikov
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=1308195843.3446.0.camel@nisroch \
--to=skeggsb-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=emil.l.velikov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@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.