On Tue, Sep 16, 2014 at 9:05 AM, Andy Lutomirski <[email protected]> wrote:
> After commit a4412fc9486e, the secure_computing function is only
> available if seccomp filters are implemented by the architecture.
> Architectures without seccomp filters use secure_computing_strict
> instead.
>
> Signed-off-by: Andy Lutomirski <[email protected]>
> ---
>
> This is minimally tested because my cross-compiler toolchain for parisc
> is quite broken. ptrace.c seems to *compile*, but it doesn't assemble.
Failed to mention: this applies on top of what tip/master, aka what
happens when tip/seccomp is merged with a newer -linus kernel.
--Andy
>
> arch/parisc/kernel/ptrace.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c
> index 3bab72462ab5..5961cc86d6d2 100644
> --- a/arch/parisc/kernel/ptrace.c
> +++ b/arch/parisc/kernel/ptrace.c
> @@ -270,11 +270,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
> {
> long ret = 0;
>
> - /* Do the secure computing check first. */
> - if (secure_computing(regs->gr[20])) {
> - /* seccomp failures shouldn't expose any additional code. */
> - return -1;
> - }
> + /*
> + * Do the secure computing check first. seccomp failures
> + * shouldn't expose any additional code.
> + */
> + secure_computing_strict(regs->gr[20]);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
> tracehook_report_syscall_entry(regs))
> --
> 1.9.3
>
--
Andy Lutomirski
AMA Capital Management, LLC
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
