The patch titled
statistics infrastructure: small cleanup in debugfs write function
has been added to the -mm tree. Its filename is
statistics-infrastructure-small-cleanup-in-debugfs-write-function.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: statistics infrastructure: small cleanup in debugfs write function
From: Martin Peschke <mp3@xxxxxxxxxx>
Code looks more sane with this little cleanup, although both memcpy() and
kfree() are supposed to cope with NULL pointer or zero length respectively.
Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/statistic.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff -puN lib/statistic.c~statistics-infrastructure-small-cleanup-in-debugfs-write-function lib/statistic.c
--- a/lib/statistic.c~statistics-infrastructure-small-cleanup-in-debugfs-write-function
+++ a/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;
_
Patches currently in -mm which might be from mp3@xxxxxxxxxx are
statistics-infrastructure-prerequisite-list.patch
statistics-infrastructure-prerequisite-parser.patch
statistics-infrastructure-prerequisite-parser-fix.patch
add-for_each_substring-and-match_substring.patch
statistics-infrastructure-prerequisite-timestamp.patch
statistics-infrastructure-make-printk_clock-a-generic-kernel-wide-nsec-resolution.patch
statistics-infrastructure-documentation.patch
statistics-infrastructure.patch
statistics-infrastructure-add-for_each_substring-and-match_substring-exploitation.patch
statistics-infrastructure-fix-parsing-of-statistics-type-attribute.patch
statistics-infrastructure-simplify-statistics-debugfs-write-function.patch
statistics-infrastructure-simplify-statistics-debugfs-read-functions.patch
statistics-infrastructure-fix-string-termination.patch
statistics-infrastructure-small-cleanup-in-debugfs-write-function.patch
statistics-infrastructure-fix-cpu-hot-unplug-related-memory-leak.patch
statistics-infrastructure-exploitation-zfcp.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
