statistics: small cleanup in debugfs write function

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:51 UTC #0 lore raw

PATCH 1/1 statistics: small cleanup in debugfs write function

Code looks more sane with this little cleanup, although both memcpy() and kfree() are supposed to cope with NULL pointer or zero length respectively.

(Patch cleans up 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 |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

lib/statistic.c +4 -2

Index: linux/lib/statistic.c
===================================================================
@@ -631,11 +631,13 @@ static ssize_t statistic_write_def(struc
 	if (!larger)
 		return -ENOMEM;
 	larger[*offset + len] = '\0';
-	memcpy(larger, seq_priv->w_buf, *offset);
+	if (seq_priv->w_buf) {
+		memcpy(larger, seq_priv->w_buf, *offset);
+		kfree(seq_priv->w_buf);
+	}
 	if (copy_from_user(larger + *offset, buf, len))
 		return -EFAULT;
 	*offset += len;
-	kfree(seq_priv->w_buf);
 	seq_priv->w_buf = larger;
 	seq_priv->w_offset = *offset;
 	return len;