public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] proc: restrict access to /proc/PID/io
@ 2011-06-24 12:08 Vasiliy Kulikov
  2011-06-27  2:58 ` KOSAKI Motohiro
  2011-06-28  1:13 ` Balbir Singh
  0 siblings, 2 replies; 15+ messages in thread
From: Vasiliy Kulikov @ 2011-06-24 12:08 UTC (permalink / raw)
  To: linux-kernel
  Cc: Balbir Singh, Andrew Morton, Al Viro, David Rientjes,
	Stephen Wilson, KOSAKI Motohiro, security, Eric Paris,
	Solar Designer

/proc/PID/io may be used for gathering private information.  E.g. for
openssh and vsftpd daemons wchars/rchars may be used to learn the
precise password length.  Restrict it to processes being able to ptrace
the target process.

ptrace_may_access() is needed to prevent keeping open file descriptor of
"io" file, executing setuid binary and gathering io information of the
setuid'ed process.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
---
 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 14def99..5ae25d1 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2712,6 +2712,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;
 
@@ -2843,7 +2846,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),
@@ -3185,7 +3188,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),
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2011-06-29 11:20 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-24 12:08 [PATCH 1/2] proc: restrict access to /proc/PID/io Vasiliy Kulikov
2011-06-27  2:58 ` KOSAKI Motohiro
2011-06-27  7:03   ` Vasiliy Kulikov
2011-06-27  7:33     ` KOSAKI Motohiro
2011-06-27  8:52       ` Vasiliy Kulikov
2011-06-27 10:07         ` KOSAKI Motohiro
2011-06-27 10:59           ` Vasiliy Kulikov
2011-06-27 22:37         ` Solar Designer
2011-06-28  1:24         ` Balbir Singh
2011-06-28  7:50           ` Vasiliy Kulikov
2011-06-29  1:16             ` Balbir Singh
2011-06-29 11:20               ` Vasiliy Kulikov
2011-06-28  1:13 ` Balbir Singh
2011-06-28  1:15   ` Balbir Singh
2011-06-28  7:50   ` Vasiliy Kulikov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox