From b48ef315486ac62d2c160639c6a27f9c62506265 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Fri, 24 Jun 2011 16:08:38 +0400 Subject: [PATCH] --- yaml --- r: 254119 b: refs/heads/master c: 1d1221f375c94ef961ba8574ac4f85c8870ddd51 h: refs/heads/master i: 254117: dbb014b59167e30a612479e3eaee583b1f3c6770 254115: b5f5c60c723c0c7d27b911ce797d1ce8b48292b5 254111: 0a3940b4c95fbe329c6fa442c4a27648e49205aa v: v3 --- [refs] | 2 +- trunk/fs/proc/base.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a2b3d74e9936..ca8c185cc037 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0af8dfdd67699e25083478c63eedef2e72ebd85 +refs/heads/master: 1d1221f375c94ef961ba8574ac4f85c8870ddd51 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 8a84210ca080..fc5bc2767692 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/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),