Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull seccomp fix from James Morris:
 "A fix for a regression in the seccomp code (it was supposed to be in
  the first pull req but I had it queued in the wrong branch)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  seccomp: Only dump core when single-threaded

1 files changed, 8 insertions, 5 deletions

diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index f8f88ebcb3ba..e15185c28de5 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -643,11 +643,14 @@ static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd,
         default: {
                 siginfo_t info;
                 audit_seccomp(this_syscall, SIGSYS, action);
-                /* Show the original registers in the dump. */
-                syscall_rollback(current, task_pt_regs(current));
-                /* Trigger a manual coredump since do_exit skips it. */
-                seccomp_init_siginfo(&info, this_syscall, data);
-                do_coredump(&info);
+                /* Dump core only if this is the last remaining thread. */
+                if (get_nr_threads(current) == 1) {
+                        /* Show the original registers in the dump. */
+                        syscall_rollback(current, task_pt_regs(current));
+                        /* Trigger a manual coredump since do_exit skips it. */
+                        seccomp_init_siginfo(&info, this_syscall, data);
+                        do_coredump(&info);
+                }
                 do_exit(SIGSYS);
         }
         }