History

Merge branch 'work.fdpic' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull fdpick coredump update from Al Viro: "Switches fdpic coredumps away from original aout dumping primitives to the same kind of regset use as regular elf coredumps do" * 'work.fdpic' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: [elf-fdpic] switch coredump to regsets [elf-fdpic] use elf_dump_thread_status() for the dumper thread as well [elf-fdpic] move allocation of elf_thread_status into elf_dump_thread_status() [elf-fdpic] coredump: don't bother with cyclic list for per-thread objects kill elf_fpxregs_t take fdpic-related parts of elf_prstatus out unexport linux/elfcore.h

Linus Torvalds committed 6 years ago

Commit 0f432832 parents 6ba0d2e 1697a3210 files · +146 −268Browse files

Showing the changes to include/linux (2 of 10 files). Show all

Unified · Split

2 files
  1. include/linux/elfcore-compat.h +0 −4
  2. include/linux/elfcore.h +56 −10
include/linux/elfcore-compat.h+0−4
@@ -32,10 +32,6 @@ struct compat_elf_prstatus · 31 unmodified lines
32 struct old_timeval32 pr_cutime;32 struct old_timeval32 pr_cutime;
33 struct old_timeval32 pr_cstime;33 struct old_timeval32 pr_cstime;
34 compat_elf_gregset_t pr_reg;34 compat_elf_gregset_t pr_reg;
35#ifdef CONFIG_BINFMT_ELF_FDPIC
36 compat_ulong_t pr_exec_fdpic_loadmap;
37 compat_ulong_t pr_interp_fdpic_loadmap;
38#endif
39 compat_int_t pr_fpvalid;35 compat_int_t pr_fpvalid;
40};36};
41 37
include/linux/elfcore.h+56−10
@@ -5,12 +5,65 @@ · 4 unmodified lines
5#include <linux/user.h>5#include <linux/user.h>
6#include <linux/bug.h>6#include <linux/bug.h>
7#include <linux/sched/task_stack.h>7#include <linux/sched/task_stack.h>
8 8#include <linux/types.h>
9#include <asm/elf.h>9#include <linux/signal.h>
10#include <uapi/linux/elfcore.h>10#include <linux/time.h>
11#include <linux/ptrace.h>
12#include <linux/fs.h>
13#include <linux/elf.h>
11 14
12struct coredump_params;15struct coredump_params;
13 16
17struct elf_siginfo
18{
19 int si_signo; /* signal number */
20 int si_code; /* extra code */
21 int si_errno; /* errno */
22};
23
24/*
25 * Definitions to generate Intel SVR4-like core files.
26 * These mostly have the same names as the SVR4 types with "elf_"
27 * tacked on the front to prevent clashes with linux definitions,
28 * and the typedef forms have been avoided. This is mostly like
29 * the SVR4 structure, but more Linuxy, with things that Linux does
30 * not support and which gdb doesn't really use excluded.
31 */
32struct elf_prstatus
33{
34 struct elf_siginfo pr_info; /* Info associated with signal */
35 short pr_cursig; /* Current signal */
36 unsigned long pr_sigpend; /* Set of pending signals */
37 unsigned long pr_sighold; /* Set of held signals */
38 pid_t pr_pid;
39 pid_t pr_ppid;
40 pid_t pr_pgrp;
41 pid_t pr_sid;
42 struct __kernel_old_timeval pr_utime; /* User time */
43 struct __kernel_old_timeval pr_stime; /* System time */
44 struct __kernel_old_timeval pr_cutime; /* Cumulative user time */
45 struct __kernel_old_timeval pr_cstime; /* Cumulative system time */
46 elf_gregset_t pr_reg; /* GP registers */
47 int pr_fpvalid; /* True if math co-processor being used. */
48};
49
50#define ELF_PRARGSZ (80) /* Number of chars for args */
51
52struct elf_prpsinfo
53{
54 char pr_state; /* numeric process state */
55 char pr_sname; /* char for pr_state */
56 char pr_zomb; /* zombie */
57 char pr_nice; /* nice val */
58 unsigned long pr_flag; /* flags */
59 __kernel_uid_t pr_uid;
60 __kernel_gid_t pr_gid;
61 pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid;
62 /* Lots missing */
63 char pr_fname[16]; /* filename of executable */
64 char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
65};
66
14static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *regs)67static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *regs)
15{68{
16#ifdef ELF_CORE_COPY_REGS69#ifdef ELF_CORE_COPY_REGS
@@ -51,13 +104,6 @@ static inline int elf_core_copy_task_fpregs(struct task_struct *t, struct pt_reg · 34 unmodified lines
51#endif104#endif
52}105}
53 106
54#ifdef ELF_CORE_COPY_XFPREGS
55static inline int elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregset_t *xfpu)
56{
57 return ELF_CORE_COPY_XFPREGS(t, xfpu);
58}
59#endif
60
61/*107/*
62 * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out108 * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out
63 * extra segments containing the gate DSO contents. Dumping its109 * extra segments containing the gate DSO contents. Dumping its

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t