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(-)
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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
