diff for duplicates of <1465506124-21866-10-git-send-email-keescook@chromium.org> diff --git a/a/1.txt b/N1/1.txt index d79b1c6..71ee611 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,3 +24,16 @@ index c50af846ecf9..6103b24d1bfc 100644 - if (secure_computing(NULL) == -1) - return -1; +- + if (test_thread_flag(TIF_SYSCALL_TRACE) && + tracehook_report_syscall_entry(regs)) +- ret = -1; ++ return -1; ++ ++ if (secure_computing(NULL) == -1) ++ return -1; + + if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT))) + trace_sys_enter(regs, regs->regs[2]); +-- +2.7.4 diff --git a/a/content_digest b/N1/content_digest index e559aff..b0e55bd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -26,7 +26,10 @@ Michael Ellerman <mpe@ellerman.id.au> Paul Mackerras <paulus@samba.org> Richard Weinberger <richard@nod.at> - " Russell King <linux@armlinux.org>\0" + Russell King <linux@armlinux.org.uk> + user-mode-linux-devel@lists.sourceforge.net + Will Deacon <will.deacon@arm.com> + " x86@kernel.org\0" "\00:1\0" "b\0" "Close the hole where ptrace can change a syscall out from under seccomp.\n" @@ -54,6 +57,19 @@ " \tcurrent_thread_info()->syscall = syscall;\n" " \n" "-\tif (secure_computing(NULL) == -1)\n" - "-\t\treturn -1;" + "-\t\treturn -1;\n" + "-\n" + " \tif (test_thread_flag(TIF_SYSCALL_TRACE) &&\n" + " \t tracehook_report_syscall_entry(regs))\n" + "-\t\tret = -1;\n" + "+\t\treturn -1;\n" + "+\n" + "+\tif (secure_computing(NULL) == -1)\n" + "+\t\treturn -1;\n" + " \n" + " \tif (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))\n" + " \t\ttrace_sys_enter(regs, regs->regs[2]);\n" + "-- \n" + 2.7.4 -4e7a59e969b6878c642cfdaf3c9c243984d44ea983bf0739d707e3e890019145 +e5918da2b1428cb3bd26db2b1693423d5bb10671dff3366028562d05ef2766fa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox