public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Aleksa Sarai <asarai@suse.com>
To: Ingo Molnar <mingo@redhat.com>, Peter Zijlstra <peterz@infradead.org>
Cc: Aleksa Sarai <cyphar@cyphar.com>,
	linux-kernel@vger.kernel.org, Aleksa Sarai <asarai@suse.com>,
	stable@vger.kernel.org, Jess Frazelle <acidburn@google.com>
Subject: [PATCH] sched: debug: use task_pid_vnr in /proc/$pid/sched
Date: Sun,  6 Aug 2017 02:52:26 +1000	[thread overview]
Message-ID: <20170805165226.31398-1-asarai@suse.com> (raw)

It appears as though the addition of the PID namespace did not update
the output code for /proc/$pid/sched, which made it trivial to figure
out whether a process was inside &init_pid_ns from userspace (making
container detection trivial[1]). This lead to situations such as:

  % unshare -pf head -n1 /proc/self/sched
  head (10047, #threads: 1)

Fix this by just using task_pid_vnr for the output of /proc/$pid/sched.
All of the other uses of task_pid_nr in kernel/sched/debug.c are from a
sysctl context and thus don't need to be namespaced.

[1]: https://github.com/jessfraz/amicontained

Cc: <stable@vger.kernel.org>
Cc: Jess Frazelle <acidburn@google.com>
Signed-off-by: Aleksa Sarai <asarai@suse.com>
---
 kernel/sched/debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 4fa66de52bd6..a06acbe33e16 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -876,7 +876,7 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
 {
 	unsigned long nr_switches;
 
-	SEQ_printf(m, "%s (%d, #threads: %d)\n", p->comm, task_pid_nr(p),
+	SEQ_printf(m, "%s (%d, #threads: %d)\n", p->comm, task_pid_vnr(p),
 						get_nr_threads(p));
 	SEQ_printf(m,
 		"---------------------------------------------------------"
-- 
2.13.3

             reply	other threads:[~2017-08-05 16:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-05 16:52 Aleksa Sarai [this message]
2017-08-05 17:58 ` [PATCH] sched: debug: use task_pid_vnr in /proc/$pid/sched Aleksa Sarai
2017-08-06  3:50   ` Eric W. Biederman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170805165226.31398-1-asarai@suse.com \
    --to=asarai@suse.com \
    --cc=acidburn@google.com \
    --cc=cyphar@cyphar.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox