2 files changed, 7 insertions, 1 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1d14cc6b79ad..3a41c4424a0a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -82,6 +82,7 @@ config X86
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select GENERIC_IOMAP
         select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
+        select HAVE_ARCH_SECCOMP_FILTER
 
 config INSTRUCTION_DECODER
         def_bool (KPROBES || PERF_EVENTS)
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index 685845cf16e0..13b1990c7c58 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -1480,7 +1480,11 @@ long syscall_trace_enter(struct pt_regs *regs)
                 regs->flags |= X86_EFLAGS_TF;
 
         /* do the secure computing check first */
-        secure_computing(regs->orig_ax);
+        if (secure_computing(regs->orig_ax)) {
+                /* seccomp failures shouldn't expose any additional code. */
+                ret = -1L;
+                goto out;
+        }
 
         if (unlikely(test_thread_flag(TIF_SYSCALL_EMU)))
                 ret = -1L;
@@ -1505,6 +1509,7 @@ long syscall_trace_enter(struct pt_regs *regs)
                                     regs->dx, regs->r10);
 #endif
 
+out:
         return ret ?: regs->orig_ax;
 }