aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorStephen Wilson <wilsons@start.ca>2011-03-13 15:49:24 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-03-23 16:36:59 -0400
commit198214a7ee50375fa71a65e518341980cfd4b2f0 (patch)
treecfd389ba211b8742c99dcbb866b3a6c0864f2164 /fs
parent8b0db9db19858b08c46a84540acfd35f6e6487b8 (diff)
proc: enable writing to /proc/pid/mem
With recent changes there is no longer a security hazard with writing to /proc/pid/mem. Remove the #ifdef. Signed-off-by: Stephen Wilson <wilsons@start.ca> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/base.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index e34c3c33b2de..bc15df390ec4 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -854,10 +854,6 @@ out_no_task:
854 return ret; 854 return ret;
855} 855}
856 856
857#define mem_write NULL
858
859#ifndef mem_write
860/* This is a security hazard */
861static ssize_t mem_write(struct file * file, const char __user *buf, 857static ssize_t mem_write(struct file * file, const char __user *buf,
862 size_t count, loff_t *ppos) 858 size_t count, loff_t *ppos)
863{ 859{
@@ -914,7 +910,6 @@ out_task:
914out_no_task: 910out_no_task:
915 return copied; 911 return copied;
916} 912}
917#endif
918 913
919loff_t mem_lseek(struct file *file, loff_t offset, int orig) 914loff_t mem_lseek(struct file *file, loff_t offset, int orig)
920{ 915{