Commit d7276e32 authored by Kees Cook's avatar Kees Cook Committed by James Morris

seccomp: Only dump core when single-threaded

The SECCOMP_RET_KILL filter return code has always killed the current
thread, not the entire process. Changing this as a side-effect of dumping
core isn't a safe thing to do (a few test suites have already flagged this
behavioral change). Instead, restore the RET_KILL semantics, but still
dump core when a RET_KILL delivers SIGSYS to a single-threaded process.

Fixes: b25e6716 ("seccomp: dump core when using SECCOMP_RET_KILL")
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarAndrei Vagin <avagin@virtuozzo.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 37c85961
...@@ -643,11 +643,14 @@ static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd, ...@@ -643,11 +643,14 @@ static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd,
default: { default: {
siginfo_t info; siginfo_t info;
audit_seccomp(this_syscall, SIGSYS, action); audit_seccomp(this_syscall, SIGSYS, action);
/* Show the original registers in the dump. */ /* Dump core only if this is the last remaining thread. */
syscall_rollback(current, task_pt_regs(current)); if (get_nr_threads(current) == 1) {
/* Trigger a manual coredump since do_exit skips it. */ /* Show the original registers in the dump. */
seccomp_init_siginfo(&info, this_syscall, data); syscall_rollback(current, task_pt_regs(current));
do_coredump(&info); /* Trigger a manual coredump since do_exit skips it. */
seccomp_init_siginfo(&info, this_syscall, data);
do_coredump(&info);
}
do_exit(SIGSYS); do_exit(SIGSYS);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment