public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [Patch] statistics: small cleanup in debugfs write function
@ 2007-04-10 15:51 Martin Peschke
  0 siblings, 0 replies; only message in thread
From: Martin Peschke @ 2007-04-10 15:51 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-kernel, linux-s390

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 <mp3@de.ibm.com>
---

 statistic.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: linux/lib/statistic.c
===================================================================
--- linux.orig/lib/statistic.c
+++ 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;



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

only message in thread, other threads:[~2007-04-10 15:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-10 15:51 [Patch] statistics: small cleanup in debugfs write function Martin Peschke

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox