lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/proc/base.c: fix proc_fault_inject_write() input sanity check

Browse Source 
Remove obfuscated zero-length input check and return -EINVAL instead of
-EIO error to make the error message clear to user.  Add whitespace
stripping.  No functionality changes.

The old code:

echo  1  > /proc/pid/make-it-fail (ok)
echo 1foo > /proc/pid/make-it-fail (-bash: echo: write error: Input/output error)

The new code:

echo  1  > /proc/pid/make-it-fail (ok)
echo 1foo > /proc/pid/make-it-fail (-bash: echo: write error: Invalid argument)

This patch is conservative in changes to not breaking existing
scripts/applications.

Signed-off-by: Vincent Li <macli@brc.ubc.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Vincent Li
2009-09-22 16:45:38 -07:00
committed by Linus Torvalds
parent fb92a4b068
commit cba8aafe1e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/proc/base.c
View File

@@ -1187,17 +1187,16 @@ static ssize_t proc_fault_inject_write(struct file * file,
count = sizeof(buffer) - 1; count = sizeof(buffer) - 1;
if (copy_from_user(buffer, buf, count)) if (copy_from_user(buffer, buf, count))
return -EFAULT; return -EFAULT;
make_it_fail = simple_strtol(buffer, &end, 0); make_it_fail = simple_strtol(strstrip(buffer), &end, 0);
if (*end == '\n') if (*end)
end++; return -EINVAL;
task = get_proc_task(file->f_dentry->d_inode); task = get_proc_task(file->f_dentry->d_inode);
if (!task) if (!task)
return -ESRCH; return -ESRCH;
task->make_it_fail = make_it_fail; task->make_it_fail = make_it_fail;
put_task_struct(task); put_task_struct(task);
if (end - buffer == 0)
return -EIO; return count;
return end - buffer;
} }
static const struct file_operations proc_fault_inject_operations = { static const struct file_operations proc_fault_inject_operations = {