fs/proc/base.c: fix proc_fault_inject_write() input sanity check
PATCH 1/1 fs/proc/base.c: fix proc_fault_inject_write() input sanity check
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. based on v2.6.31-rc6, compiled and tested ok.
--- fs/proc/base.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)
fs/proc/base.c +5 -6
@@ -1182,17 +1182,16 @@ static ssize_t proc_fault_inject_write(struct file * file, count =sizeof (buffer) -1 ;if (copy_from_user (buffer, buf, count))return -EFAULT ; - make_it_fail =simple_strtol (buffer, &end,0 ); -if (*end =='\n' ) - end++; + make_it_fail =simple_strtol (strstrip (buffer), &end,0 ); +if (*end) +return -EINVAL ; task =get_proc_task (file->f_dentry->d_inode);if (!task)return -ESRCH ; task->make_it_fail = make_it_fail;put_task_struct (task); -if (end - buffer ==0 ) -return -EIO ; -return end - buffer; + +return count; }static const struct file_operations proc_fault_inject_operations = {
Signature · 1 line
1.6.0.4
Quoted 2 lines · Vincent Li
Remove obfuscated zero-length input check and return
-EINVALinstead of-EIOerror to make the error message clear to user. Add whitespace stripping. No functionality changes.
If so, why not introduce a new wrapper which is simply strstrip+simple_strtol? Now, at least it has two users.
Quoted 54 lines
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. based on v2.6.31-rc6, compiled and tested ok.Signed-off-by Vincent Li <[email protected]>---
fs/proc/base.c| 11 +++++------1 files changed, 5 insertions(+), 6 deletions(-)fs/proc/base.c +5
-6@@ -1182,17 +1182,16 @@ static ssize_t proc_fault_inject_write(struct file * file, count =sizeof (buffer) -1 ;if (copy_from_user (buffer, buf, count))return -EFAULT ; - make_it_fail =simple_strtol (buffer, &end,0 ); -if (*end =='\n' ) - end++; + make_it_fail =simple_strtol (strstrip (buffer), &end,0 ); +if (*end) +return -EINVAL ; task =get_proc_task (file->f_dentry->d_inode);if (!task)return -ESRCH ; task->make_it_fail = make_it_fail;put_task_struct (task); -if (end - buffer ==0 ) -return -EIO ; -return end - buffer; + +return count; }static const struct file_operations proc_fault_inject_operations = {Signature · 7 lines
1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Quoted 6 lines · Amerigo Wang
Quoted 2 lines · Vincent Li
Remove obfuscated zero-length input check and return
-EINVALinstead of-EIOerror to make the error message clear to user. Add whitespace stripping. No functionality changes.If so, why not introduce a new wrapper which is simply strstrip+simple_strtol? Now, at least it has two users.
The first patch I sent used strstrip + strict_strtol, I am not sure if it is neccesary.
Vincent Li
Biomedical Research Center
University of British Columbia