[patch] i915: snprintf returns large values

[patch] i915: snprintf returns large values

[Dan Carpenter]

snprintf() returns the number of bytes which would have been used if
there was enough space.  It can be larger than the size of the buffer.
Obviously in this case the buffer is large enough but everyone just
copy and pastes this code so it's better to limit it and set a good
example.

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 5e43d70..1cb29ec 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -741,6 +741,9 @@ i915_wedged_read(struct file *filp,
 		       "wedged :  %d\n",
 		       atomic_read(&dev_priv->mm.wedged));
 
+	if (len > sizeof (buf))
+		len = sizeof (buf);
+
 	return simple_read_from_buffer(ubuf, max, ppos, buf, len);
 }
 

[patch] i915: snprintf returns large values

[Dan Carpenter]

snprintf() returns the number of bytes which would have been used if
there was enough space.  It can be larger than the size of the buffer.
Obviously in this case the buffer is large enough but everyone just
copy and pastes this code so it's better to limit it and set a good
example.

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 5e43d70..1cb29ec 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -741,6 +741,9 @@ i915_wedged_read(struct file *filp,
 		       "wedged :  %d\n",
 		       atomic_read(&dev_priv->mm.wedged));
 
+	if (len > sizeof (buf))
+		len = sizeof (buf);
+
 	return simple_read_from_buffer(ubuf, max, ppos, buf, len);
 }

Re: [patch] i915: snprintf returns large values

[Chris Wilson]

On Wed, 8 Sep 2010 21:44:47 +0200, Dan Carpenter <error27@gmail.com> wrote:
> snprintf() returns the number of bytes which would have been used if
> there was enough space.  It can be larger than the size of the buffer.
> Obviously in this case the buffer is large enough but everyone just
> copy and pastes this code so it's better to limit it and set a good
> example.

Applied to drm-intel-next as it is just a pedagogical fix.
Thanks,
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [patch] i915: snprintf returns large values

[Chris Wilson]

On Wed, 8 Sep 2010 21:44:47 +0200, Dan Carpenter <error27@gmail.com> wrote:
> snprintf() returns the number of bytes which would have been used if
> there was enough space.  It can be larger than the size of the buffer.
> Obviously in this case the buffer is large enough but everyone just
> copy and pastes this code so it's better to limit it and set a good
> example.

Applied to drm-intel-next as it is just a pedagogical fix.
Thanks,
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre