Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9990e10192e8..e5102ea6e104 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -2201,14 +2201,12 @@ int sysctl_string(ctl_table *table, int __user *name, int nlen,
                 if (get_user(len, oldlenp))
                         return -EFAULT;
                 if (len) {
-                        l = strlen(table->data);
+                        l = strlen(table->data)+1;
                         if (len > l) len = l;
                         if (len >= table->maxlen)
                                 len = table->maxlen;
                         if(copy_to_user(oldval, table->data, len))
                                 return -EFAULT;
-                        if(put_user(0, ((char __user *) oldval) + len))
-                                return -EFAULT;
                         if(put_user(len, oldlenp))
                                 return -EFAULT;
                 }
@@ -2223,7 +2221,7 @@ int sysctl_string(ctl_table *table, int __user *name, int nlen,
                         len--;
                 ((char *) table->data)[len] = 0;
         }
-        return 0;
+        return 1;
 }
 
 /*