Skip to content

Commit fd7d562

Browse files
jognessKAGA-KOKO
authored andcommitted
fs/proc: Report eip/esp in /prod/PID/stat for coredumping
Commit 0a1eb2d ("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: 0a1eb2d ("fs/proc: Stop reporting eip and esp in> /proc/PID/stat") Reported-by: Marco Felsch <[email protected]> Signed-off-by: John Ogness <[email protected]> Reviewed-by: Andy Lutomirski <[email protected]> Cc: Tycho Andersen <[email protected]> Cc: Kees Cook <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Brian Gerst <[email protected]> Cc: [email protected] Cc: Tetsuo Handa <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Al Viro <[email protected]> Cc: Linux API <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Linus Torvalds <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
1 parent 97dab2a commit fd7d562

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

fs/proc/array.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
#include <linux/mman.h>
6363
#include <linux/sched/mm.h>
6464
#include <linux/sched/numa_balancing.h>
65+
#include <linux/sched/task_stack.h>
6566
#include <linux/sched/task.h>
6667
#include <linux/sched/cputime.h>
6768
#include <linux/proc_fs.h>
@@ -421,7 +422,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
421422
* esp and eip are intentionally zeroed out. There is no
422423
* non-racy way to read them without freezing the task.
423424
* Programs that need reliable values can use ptrace(2).
425+
*
426+
* The only exception is if the task is core dumping because
427+
* a program is not able to use ptrace(2) in that case. It is
428+
* safe because the task has stopped executing permanently.
424429
*/
430+
if (permitted && (task->flags & PF_DUMPCORE)) {
431+
eip = KSTK_EIP(task);
432+
esp = KSTK_ESP(task);
433+
}
425434
}
426435

427436
get_task_comm(tcomm, task);

0 commit comments

Comments
 (0)