[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-fd7d56270b526ca3ed0c224362e3c64a0f86687a@git.kernel.org>
Date: Fri, 15 Sep 2017 14:36:47 -0700
From: tip-bot for John Ogness <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: peterz@...radead.org, tglx@...utronix.de,
torvalds@...ux-foundation.org, linux-kernel@...r.kernel.org,
viro@...iv.linux.org.uk, keescook@...omium.org,
linux-api@...r.kernel.org, john.ogness@...utronix.de,
marco.felsch@...h.de, akpm@...ux-foundation.org,
tycho.andersen@...onical.com, mingo@...nel.org, brgerst@...il.com,
hpa@...or.com, luto@...nel.org, bp@...en8.de,
penguin-kernel@...ove.sakura.ne.jp
Subject: [tip:core/urgent] fs/proc: Report eip/esp in /prod/PID/stat for
coredumping
Commit-ID: fd7d56270b526ca3ed0c224362e3c64a0f86687a
Gitweb: http://git.kernel.org/tip/fd7d56270b526ca3ed0c224362e3c64a0f86687a
Author: John Ogness <john.ogness@...utronix.de>
AuthorDate: Thu, 14 Sep 2017 11:42:17 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 15 Sep 2017 23:31:16 +0200
fs/proc: Report eip/esp in /prod/PID/stat for coredumping
Commit 0a1eb2d474ed ("fs/proc: Stop reporting eip and esp in
/proc/PID/stat") stopped reporting eip/esp because it is
racy and dangerous for executing tasks. The comment adds:
As far as I know, there are no use programs that make any
material use of these fields, so just get rid of them.
However, existing userspace core-dump-handler applications (for
example, minicoredumper) are using these fields since they
provide an excellent cross-platform interface to these valuable
pointers. So that commit introduced a user space visible
regression.
Partially revert the change and make the readout possible for
tasks with the proper permissions and only if the target task
has the PF_DUMPCORE flag set.
Fixes: 0a1eb2d474ed ("fs/proc: Stop reporting eip and esp in> /proc/PID/stat")
Reported-by: Marco Felsch <marco.felsch@...h.de>
Signed-off-by: John Ogness <john.ogness@...utronix.de>
Reviewed-by: Andy Lutomirski <luto@...nel.org>
Cc: Tycho Andersen <tycho.andersen@...onical.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Brian Gerst <brgerst@...il.com>
Cc: stable@...r.kernel.org
Cc: Tetsuo Handa <penguin-kernel@...ove.sakura.ne.jp>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Al Viro <viro@...iv.linux.org.uk>
Cc: Linux API <linux-api@...r.kernel.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Link: http://lkml.kernel.org/r/87poatfwg6.fsf@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
fs/proc/array.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 88c3555..525157c 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -62,6 +62,7 @@
#include <linux/mman.h>
#include <linux/sched/mm.h>
#include <linux/sched/numa_balancing.h>
+#include <linux/sched/task_stack.h>
#include <linux/sched/task.h>
#include <linux/sched/cputime.h>
#include <linux/proc_fs.h>
@@ -421,7 +422,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
* esp and eip are intentionally zeroed out. There is no
* non-racy way to read them without freezing the task.
* Programs that need reliable values can use ptrace(2).
+ *
+ * The only exception is if the task is core dumping because
+ * a program is not able to use ptrace(2) in that case. It is
+ * safe because the task has stopped executing permanently.
*/
+ if (permitted && (task->flags & PF_DUMPCORE)) {
+ eip = KSTK_EIP(task);
+ esp = KSTK_ESP(task);
+ }
}
get_task_comm(tcomm, task);
Powered by blists - more mailing lists