diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-30 16:25:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-30 16:25:57 -0700 |
| commit | 61b5ebd6ffc3099618a2e79903e5ee0577c10799 (patch) | |
| tree | fe3e500a68b4ee94236b78590c10a0a9f13aad8b /kernel | |
| parent | 86a1679860babbacd61fc1e8c0c0f43641d5860d (diff) | |
| parent | 485a252a5559b45d7df04c819ec91177c62c270b (diff) | |
| download | linux-61b5ebd6ffc3099618a2e79903e5ee0577c10799.tar.bz2 | |
Merge tag 'seccomp-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull seccomp fix from Kees Cook:
"Fix fatal signal delivery after ptrace reordering"
* tag 'seccomp-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
seccomp: Fix tracer exit notifications during fatal signals
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/seccomp.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index ef6c6c3f9d8a..0db7c8a2afe2 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -605,12 +605,16 @@ static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd, ptrace_event(PTRACE_EVENT_SECCOMP, data); /* * The delivery of a fatal signal during event - * notification may silently skip tracer notification. - * Terminating the task now avoids executing a system - * call that may not be intended. + * notification may silently skip tracer notification, + * which could leave us with a potentially unmodified + * syscall that the tracer would have liked to have + * changed. Since the process is about to die, we just + * force the syscall to be skipped and let the signal + * kill the process and correctly handle any tracer exit + * notifications. */ if (fatal_signal_pending(current)) - do_exit(SIGSYS); + goto skip; /* Check if the tracer forced the syscall to be skipped. */ this_syscall = syscall_get_nr(current, task_pt_regs(current)); if (this_syscall < 0) |