diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 17:02:12 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 17:02:12 +0900 |
| commit | 4af358f81881e1d083a916c9269b5ac0936e180d (patch) | |
| tree | c0533d3268daccb6f06f1180aa1ae8f1aac17d36 /fs/proc/base.c | |
| parent | 7653aaab775d4c205a7dce52850c8e3d4f31d4ea (diff) | |
| parent | b63d10130e68aa6480cc1b2483d7c5ce57a05481 (diff) | |
| download | linux-4af358f81881e1d083a916c9269b5ac0936e180d.tar.gz linux-4af358f81881e1d083a916c9269b5ac0936e180d.tar.bz2 linux-4af358f81881e1d083a916c9269b5ac0936e180d.zip | |
Merge branch 'fbdev/stable-updates'
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 8a84210ca080..fc5bc2767692 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2708,6 +2708,9 @@ static int do_io_accounting(struct task_struct *task, char *buffer, int whole) struct task_io_accounting acct = task->ioac; unsigned long flags; + if (!ptrace_may_access(task, PTRACE_MODE_READ)) + return -EACCES; + if (whole && lock_task_sighand(task, &flags)) { struct task_struct *t = task; @@ -2839,7 +2842,7 @@ static const struct pid_entry tgid_base_stuff[] = { REG("coredump_filter", S_IRUGO|S_IWUSR, proc_coredump_filter_operations), #endif #ifdef CONFIG_TASK_IO_ACCOUNTING - INF("io", S_IRUGO, proc_tgid_io_accounting), + INF("io", S_IRUSR, proc_tgid_io_accounting), #endif #ifdef CONFIG_HARDWALL INF("hardwall", S_IRUGO, proc_pid_hardwall), @@ -3181,7 +3184,7 @@ static const struct pid_entry tid_base_stuff[] = { REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations), #endif #ifdef CONFIG_TASK_IO_ACCOUNTING - INF("io", S_IRUGO, proc_tid_io_accounting), + INF("io", S_IRUSR, proc_tid_io_accounting), #endif #ifdef CONFIG_HARDWALL INF("hardwall", S_IRUGO, proc_pid_hardwall), |