This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / oprofile / oprofilefs.c

diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index d9746f1..b80990d 100644 (file)
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -47,7 +47,23 @@ static struct super_operations s_ops = {
 
 ssize_t oprofilefs_str_to_user(char const * str, char __user * buf, size_t count, loff_t * offset)
 {
-       return simple_read_from_buffer(buf, count, offset, str, strlen(str));
+       size_t len = strlen(str);
+
+       if (!count)
+               return 0;
+
+       if (*offset > len)
+               return 0;
+
+       if (count > len - *offset)
+               count = len - *offset;
+
+       if (copy_to_user(buf, str + *offset, count))
+               return -EFAULT;
+
+       *offset += count;
+
+       return count;
 }
 
 
@@ -56,10 +72,29 @@ ssize_t oprofilefs_str_to_user(char const * str, char __user * buf, size_t count
 ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t count, loff_t * offset)
 {
        char tmpbuf[TMPBUFSIZE];
-       size_t maxlen = snprintf(tmpbuf, TMPBUFSIZE, "%lu\n", val);
+       size_t maxlen;
+
+       if (!count)
+               return 0;
+
+       spin_lock(&oprofilefs_lock);
+       maxlen = snprintf(tmpbuf, TMPBUFSIZE, "%lu\n", val);
+       spin_unlock(&oprofilefs_lock);
        if (maxlen > TMPBUFSIZE)
                maxlen = TMPBUFSIZE;
-       return simple_read_from_buffer(buf, count, offset, tmpbuf, maxlen);
+
+       if (*offset > maxlen)
+               return 0;
+
+       if (count > maxlen - *offset)
+               count = maxlen - *offset;
+
+       if (copy_to_user(buf, tmpbuf + *offset, count))
+               return -EFAULT;
+
+       *offset += count;
+
+       return count;
 }