statistics: fix string termination

PATCH New Martin Peschke 1 participant 1 message Apr 10, 2007

Subsystems (2)

Library code s390

lore

Share & tools

lore

Martin Peschke

author

2007-04-10 15:47 UTC #0 lore raw

PATCH 1/1 statistics: fix string termination

Make sure strsep() in statistic_release_def() finds a terminanal '\0' and doesn't attempt to access bytes outside the given buffer.

(Patch fixes statistics-infrastructure-simplify-statistics-debugfs-write-function.patch)

Patch is against 2.6.21-rc6-mm1.

Signed-off-by Martin Peschke <[email protected]>

---

 statistic.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

lib/statistic.c +2 -1

Index: linux/lib/statistic.c
===================================================================
@@ -627,9 +627,10 @@ static ssize_t statistic_write_def(struc
 		return -EPIPE;
 	if (*offset + len > 16 * PAGE_SIZE)
 		return -ENOMEM;
-	larger = kmalloc(*offset + len, GFP_KERNEL);
+	larger = kmalloc(*offset + len + 1, GFP_KERNEL);
 	if (!larger)
 		return -ENOMEM;
+	larger[*offset + len] = '\0';
 	memcpy(larger, seq_priv->w_buf, *offset);
 	if (copy_from_user(larger + *offset, buf, len))
 		return -EFAULT;