From ee22bcbc183c2faebd332a7c4bd73d400d8b010f Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 30 Dec 2005 17:18:53 -0800 Subject: [PATCH] --- yaml --- r: 15371 b: refs/heads/master c: 8febdd85adaa41fa1fc1cb31286210fc2cd3ed0c h: refs/heads/master i: 15369: 9be1b7c2974d5cf2f4927ec7e850abfe6e90af1a 15367: 6b2b827815cb647681c6972821ab3d5073edbab6 v: v3 --- [refs] | 2 +- trunk/kernel/sysctl.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b567fc9e424a..3933922742fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b90db0df7187a01fb7177f1f812123138f562cf +refs/heads/master: 8febdd85adaa41fa1fc1cb31286210fc2cd3ed0c diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 9990e10192e8..ad0425a8f709 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/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; }