mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] drm/nouveau/pm: don't read/write beyond end of stack buffer
@ 2012-04-17 19:27 Jim Meyering
  0 siblings, 0 replies; only message in thread
From: Jim Meyering @ 2012-04-17 19:27 UTC (permalink / raw)
  To: Ben Skeggs; +Cc: Linux Kernel Mailing List


NUL-terminate after strncpy.

If the parameter "profile" has length 16 or more, then strncpy
leaves "string" with no NUL terminator, so the following search
for '\n' may read beyond the end of that 16-byte buffer.
If it finds a newline there, then it will also write beyond the
end of that stack buffer.

Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_pm.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index 34d591b..da3e7c3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -225,26 +225,27 @@ profile_find(struct drm_device *dev, const char *string)
 static int
 nouveau_pm_profile_set(struct drm_device *dev, const char *profile)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
 	struct nouveau_pm_profile *ac = NULL, *dc = NULL;
 	char string[16], *cur = string, *ptr;

 	/* safety precaution, for now */
 	if (nouveau_perflvl_wr != 7777)
 		return -EPERM;

 	strncpy(string, profile, sizeof(string));
+	string[sizeof(string) - 1] = 0;
 	if ((ptr = strchr(string, '\n')))
 		*ptr = '\0';

 	ptr = strsep(&cur, ",");
 	if (ptr)
 		ac = profile_find(dev, ptr);

 	ptr = strsep(&cur, ",");
 	if (ptr)
 		dc = profile_find(dev, ptr);
 	else
 		dc = ac;

--
1.7.10.208.gb4267

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-04-17 19:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-17 19:27 [PATCH] drm/nouveau/pm: don't read/write beyond end of stack buffer Jim Meyering

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®