fs/proc/task_mmu.c v1: fix clear_refs_write() input sanity check
Subsystems (2)
PATCH 1/1 fs/proc/task_mmu.c v1: fix clear_refs_write() input sanity check
v1 fix the compiling errors and keep the type variable name.
Andrew Morton pointed out similar string hacking and obfuscated check for zero-length input at the end of the function, David Rientjes suggested to use strict_strtol to replace simple_strtol, this patch cover above suggestions, add removing of leading and trailing whitespace from user input. It does not change function behavious.
This patch is rebased on mmotm-2009-08-04-14-22.
--- fs/proc/task_mmu.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
fs/proc/task_mmu.c +6 -8
@@ -491,21 +491,20 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct task_struct *task; -char buffer[PROC_NUMBUF ], *end; +char buffer[PROC_NUMBUF ];struct mm_struct *mm;struct vm_area_struct *vma; -int type; +long type;memset (buffer,0 ,sizeof (buffer));if (count >sizeof (buffer) -1 ) count =sizeof (buffer) -1 ;if (copy_from_user (buffer, buf, count))return -EFAULT ; - type =simple_strtol (buffer, &end,0 ); +if (strict_strtol (strstrip (buffer),10 , &type)) +return -EINVAL ;if (type <CLEAR_REFS_ALL || type >CLEAR_REFS_MAPPED )return -EINVAL ; -if (*end =='\n' ) - end++; task =get_proc_task (file->f_path.dentry->d_inode);if (!task)return -ESRCH ;
@@ -541,9 +540,8 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,mmput (mm); }put_task_struct (task); -if (end - buffer ==0 ) -return -EIO ; -return end - buffer; + +return count; }const struct file_operations proc_clear_refs_operations = {
Signature · 1 line
1.6.0.4
Quoted 7 lines · Vincent Li
v1 fix the compiling errors and keep the type variable name.
Andrew Morton pointed out similar string hacking and obfuscated check for zero-length input at the end of the function, David Rientjes suggested to use
strict_strtolto replacesimple_strtol, this patch cover above suggestions, add removing of leading and trailing whitespace from user input. It does not change function behavious.
Sorry, what real benefits can we get from this patch?
With this patch, we can accept input like:
echo ' 1' > /proc/<pid>/clear_refs
right?
If this is really necessary, why not other files similar to 'clear_refs'?
How about adding strstrip() for simple_strtol()?
Quoted 57 lines
This patch is rebased on mmotm-2009-08-04-14-22.
Signed-off-by Vincent Li <[email protected]>---
fs/proc/task_mmu.c| 14 ++++++--------1 files changed, 6 insertions(+), 8 deletions(-)fs/proc/task_mmu.c +6
-8@@ -491,21 +491,20 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct task_struct *task; -char buffer[PROC_NUMBUF ], *end; +char buffer[PROC_NUMBUF ];struct mm_struct *mm;struct vm_area_struct *vma; -int type; +long type;memset (buffer,0 ,sizeof (buffer));if (count >sizeof (buffer) -1 ) count =sizeof (buffer) -1 ;if (copy_from_user (buffer, buf, count))return -EFAULT ; - type =simple_strtol (buffer, &end,0 ); +if (strict_strtol (strstrip (buffer),10 , &type)) +return -EINVAL ;if (type <CLEAR_REFS_ALL || type >CLEAR_REFS_MAPPED )return -EINVAL ; -if (*end =='\n' ) - end++; task =get_proc_task (file->f_path.dentry->d_inode);if (!task)return -ESRCH ;@@ -541,9 +540,8 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,mmput (mm); }put_task_struct (task); -if (end - buffer ==0 ) -return -EIO ; -return end - buffer; + +return count; }const struct file_operations proc_clear_refs_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 11 lines · Amerigo Wang
Quoted 7 lines · Vincent Li
v1 fix the compiling errors and keep the type variable name.
Andrew Morton pointed out similar string hacking and obfuscated check for zero-length input at the end of the function, David Rientjes suggested to use
strict_strtolto replacesimple_strtol, this patch cover above suggestions, add removing of leading and trailing whitespace from user input. It does not change function behavious.Sorry, what real benefits can we get from this patch?
It removes the redundant and weird zero-length check at the end of the function since the the function already check the returning value of simple_strtol, if it is zero-length input, the function should already return error -EINVAL. Also using strict_strtol would only accept ascii numbers, not something like:
echo 1foo > /proc/pid/clear_refs
Quoted 6 lines
With this patch, we can accept input like:
echo ' 1' > /proc/<pid>/clear_refs
right?
It will accept 'echo 1 > /proc/pid/clear_refs', but I think
nobody will do that on purpose, only accidently typed one or two space before or after.
Quoted 3 lines
If this is really necessary, why not other files similar to '
clear_refs'?
I did the same to other functions, but Andrew pointed out making changes without fully understanding the patch impact would be risky and break existing applications, So I need to fully understand what those functions do before I make any changes.
Quoted 2 lines
How about adding
strstrip()forsimple_strtol()?
simple_strtol will accept 'echo 1foo > /proc/pid/clear_refs' which is not ideal.
Quoted 49 lines
Quoted 49 lines
This patch is rebased on mmotm-2009-08-04-14-22.
Signed-off-by Vincent Li <[email protected]>---
fs/proc/task_mmu.c| 14 ++++++--------1 files changed, 6 insertions(+), 8 deletions(-)fs/proc/task_mmu.c +6
-8@@ -491,21 +491,20 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct task_struct *task; -char buffer[PROC_NUMBUF ], *end; +char buffer[PROC_NUMBUF ];struct mm_struct *mm;struct vm_area_struct *vma; -int type; +long type;memset (buffer,0 ,sizeof (buffer));if (count >sizeof (buffer) -1 ) count =sizeof (buffer) -1 ;if (copy_from_user (buffer, buf, count))return -EFAULT ; - type =simple_strtol (buffer, &end,0 ); +if (strict_strtol (strstrip (buffer),10 , &type)) +return -EINVAL ;if (type <CLEAR_REFS_ALL || type >CLEAR_REFS_MAPPED )return -EINVAL ; -if (*end =='\n' ) - end++; task =get_proc_task (file->f_path.dentry->d_inode);if (!task)return -ESRCH ;@@ -541,9 +540,8 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,mmput (mm); }put_task_struct (task); -if (end - buffer ==0 ) -return -EIO ; -return end - buffer; + +return count; }
Quoted 4 lines
Quoted 4 lines
fs/proc/task_mmu.c +0
-0const struct file_operations proc_clear_refs_operations = {Signature · 1 line
1.6.0.4
Vincent Li
Biomedical Research Center
University of British Columbia
Quoted 12 lines · Vincent Li
Quoted 10 lines · Amerigo Wang
Quoted 7 lines · Vincent Li
v1 fix the compiling errors and keep the type variable name.
Andrew Morton pointed out similar string hacking and obfuscated check for zero-length input at the end of the function, David Rientjes suggested to use
strict_strtolto replacesimple_strtol, this patch cover above suggestions, add removing of leading and trailing whitespace from user input. It does not change function behavious.
Quoted 9 lines
Quoted 1 line
Sorry, what real benefits can we get from this patch?
It removes the redundant and weird zero-length check at the end of the function since the the function already check the returning value of
simple_strtol, if it is zero-length input, the function should already return error-EINVAL. Also usingstrict_strtolwould only accept ascii numbers, not something like:Quoted 1 line
echo 1foo >
/proc/pid/clear_refs
IIRC, many /proc files can accept input like this...
I sent a patch some time ago to "fix" this, but Andrew pointed out that things like "1foo" can be hackish. :-/
Quoted 10 lines
Quoted 4 lines
If this is really necessary, why not other files similar to '
clear_refs'?I did the same to other functions, but Andrew pointed out making changes without fully understanding the patch impact would be risky and break existing applications, So I need to fully understand what those functions do before I make any changes.
I can't find any strong reason why this one is differernt from others in accepting input like "1foo"...
Quoted 10 lines · Amerigo Wang
Quoted 5 lines
I did the same to other functions, but Andrew pointed out making changes without fully understanding the patch impact would be risky and break existing applications, So I need to fully understand what those functions do before I make any changes.
I can't find any strong reason why this one is differernt from others in accepting input like "1foo"...
As I already pointed out, there's a patch pending in mmotm that limits the write to either 1, 2, or 3, depending on the type of pages the referenced bit shall be cleared for associated with the task.
The net effect of Vincent's change is to automatically strip whitespace and to remove a needless -EIO error condition at the end of the write handler.
It is rather obvious that Vincent's patch is a clear improvement and your concern is just a waste of bandwidth.
Quoted 10 lines · Vincent Li
v1 fix the compiling errors and keep the type variable name.
Andrew Morton pointed out similar string hacking and obfuscated check for zero-length input at the end of the function, David Rientjes suggested to use
strict_strtolto replacesimple_strtol, this patch cover above suggestions, add removing of leading and trailing whitespace from user input. It does not change function behavious.This patch is rebased on mmotm-2009-08-04-14-22.
Signed-off-by Vincent Li <[email protected]>