aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2006-06-26 03:25:45 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 12:58:24 -0400
commit22c2c5d75e6ad4b9ac41269476b32ba8c9fe263f (patch)
tree568754afe4d00da3ecaee4a960021e596d0e4beb
parent68602066c3327fa340899609d715781eda423751 (diff)
[PATCH] proc: Kill proc_mem_inode_operations
The inode operations only exist to support the proc_permission function. Currently mem_read and mem_write have all the same permission checks as ptrace. The fs check makes no sense in this context, and we can trivially get around it by calling ptrace. So simply the code by killing the strange weird case. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-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 6080672276d5..2e4356f5d5e3 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -927,10 +927,6 @@ static struct file_operations proc_oom_adjust_operations = {
927 .write = oom_adjust_write, 927 .write = oom_adjust_write,
928}; 928};
929 929
930static struct inode_operations proc_mem_inode_operations = {
931 .permission = proc_permission,
932};
933
934#ifdef CONFIG_AUDITSYSCALL 930#ifdef CONFIG_AUDITSYSCALL
935#define TMPBUFLEN 21 931#define TMPBUFLEN 21
936static ssize_t proc_loginuid_read(struct file * file, char __user * buf, 932static ssize_t proc_loginuid_read(struct file * file, char __user * buf,
@@ -1697,7 +1693,6 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
1697#endif 1693#endif
1698 case PROC_TID_MEM: 1694 case PROC_TID_MEM:
1699 case PROC_TGID_MEM: 1695 case PROC_TGID_MEM:
1700 inode->i_op = &proc_mem_inode_operations;
1701 inode->i_fop = &proc_mem_operations; 1696 inode->i_fop = &proc_mem_operations;
1702 break; 1697 break;
1703#ifdef CONFIG_SECCOMP 1698#ifdef CONFIG_SECCOMP