---

yaml --- r: 15371 b: refs/heads/master c: 8febdd8 h: refs/heads/master i: 15369: 9be1b7c 15367: 6b2b827 v: v3
git-mirror · Dec 31, 2005 · ee22bcb · ee22bcb
1 parent 603fd90
commit ee22bcb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;
 		}