From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 543ACC49EA6 for ; Thu, 24 Jun 2021 00:46:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FA4C61358 for ; Thu, 24 Jun 2021 00:46:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229774AbhFXAs3 (ORCPT ); Wed, 23 Jun 2021 20:48:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbhFXAs1 (ORCPT ); Wed, 23 Jun 2021 20:48:27 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91EC0C06175F for ; Wed, 23 Jun 2021 17:46:08 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id bb10-20020a17090b008ab029016eef083425so4812259pjb.5 for ; Wed, 23 Jun 2021 17:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AEcE7gUCuSy+6ivM1ZIg2ZOLoO/kyHePM/0KklD0CqQ=; b=XU5qLQQF0Js54N5gyW9KhnOiP+Nh43NrytRw6P+hDMIJfa+LSUzYES+Xu7tLacglpN 8tSHEf+lRo5NQEe743yLDo+w5xfPlVtvRU7y6Y9KQJ9fX6PbpUcXx2JAHfmuRNNru72E yG3aGwbKL3XmKSsZklqAVe/YtrcS7GT/R6CGGeC+kNG3sxEVneyzgpaJ+W6Pswo51w0J Tj7e8ESRA54scZnEjWAxu2bnY0pzXBTpPCd4qZLPCwTbCa3IWF8kSPRRDAC/nJag7eOv A/Ik4sNJfBRVXpV6Dhr3T+dAAYhVJeOhDl8eUsLT6So46AbgwGXIaDXz1lPkeCj6feIm TXuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AEcE7gUCuSy+6ivM1ZIg2ZOLoO/kyHePM/0KklD0CqQ=; b=rEttw85edClYijoRV5cliszps8zw/rkeNtM3ohoZqIsyWX1lGsH5gQNZRmP+LJQtSg htTyeWXmA7b0Nvnlu7qRjdaJ6HNefCoOsFSEWnOR+qvBNjiGIkw1ORDTx2FzjAxnVZbL PyUa21+n7vwtCqQ6n9h/h7Ya4UwI7llYtdk19vdECx9QVHP01sC4i2IPWLhmUF2+nlDQ kz63fwZFGK2tTMktAXgrMXdhec9xis7W6avJnHhLCA2ZWH/fl+NRjqH+5AWq1cvig4xj CF0tZ78IqIkAwGYew6E8EcmKho9jWfGfiGr8foMTtcLhJTG3e6kRAzZbADrK4VpNVDU4 tFqQ== X-Gm-Message-State: AOAM531748mRFD8mEyO0QVt9hRF1mroZefGN9jSrkMTB5HGsnR93tm63 G2Q1FEOoe0ux6YEZ6457RcX4AiENKQjtLQ== X-Google-Smtp-Source: ABdhPJxqpCCC6qleZvU39SFA1mSyJWpyoodnWUExHQ5FWglJ7Vs6vl/wCr92qP2I69Gmx+ANM0Ptww== X-Received: by 2002:a17:902:e5c1:b029:127:683b:175f with SMTP id u1-20020a170902e5c1b0290127683b175fmr1840237plf.18.1624495568153; Wed, 23 Jun 2021 17:46:08 -0700 (PDT) Received: from xplor.waratah.dyndns.org (222-152-189-137-fibre.sparkbb.co.nz. [222.152.189.137]) by smtp.gmail.com with ESMTPSA id h18sm268055pgl.87.2021.06.23.17.46.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jun 2021 17:46:07 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 7BF413603E0; Thu, 24 Jun 2021 12:46:03 +1200 (NZST) From: Michael Schmitz To: linux-m68k@vger.kernel.org, geert@linux-m68k.org Cc: glaubitz@physik.fu-berlin.de, schwab@linux-m68k.org, Michael Schmitz Subject: [PATCH v6 2/2] m68k: add kernel seccomp support Date: Thu, 24 Jun 2021 12:46:00 +1200 Message-Id: <1624495560-6351-3-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1624495560-6351-1-git-send-email-schmitzmic@gmail.com> References: <1624495560-6351-1-git-send-email-schmitzmic@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-m68k@vger.kernel.org Add secure_computing() call to syscall_trace_enter to actually filter system calls. Add necessary arch Kconfig options, define TIF_SECCOMP trace flag and provide basic seccomp filter support in asm/syscall.h syscall_get_nr currently uses the syscall nr stored in orig_d0 because we change d0 to a default return code before starting a syscall trace. This may be inconsistent with syscall_rollback copying orig_d0 to d0 (which we never check upon return from trace). We use d0 for the return code from syscall_trace_enter in entry.S currently, and could perhaps expand that to store a new syscall number returned by the seccomp filter before executing the syscall. This clearly needs some discussion. Compiles (for Atari) and boots on ARAnyM, otherwise untested. Signed-off-by: Michael Schmitz -- Changes from v5: Geert Uytterhoeven: - correct wrong offset for d1-d5 register copy - update Documentation/features/seccomp/seccomp-filter/arch-support.txt --- .../seccomp/seccomp-filter/arch-support.txt | 2 +- arch/m68k/Kconfig | 2 ++ arch/m68k/include/asm/seccomp.h | 11 ++++++++ arch/m68k/include/asm/syscall.h | 33 ++++++++++++++++++++++ arch/m68k/include/asm/thread_info.h | 2 ++ arch/m68k/kernel/ptrace.c | 5 ++++ 6 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 arch/m68k/include/asm/seccomp.h diff --git a/Documentation/features/seccomp/seccomp-filter/arch-support.txt b/Documentation/features/seccomp/seccomp-filter/arch-support.txt index 26eec58..be71f20 100644 --- a/Documentation/features/seccomp/seccomp-filter/arch-support.txt +++ b/Documentation/features/seccomp/seccomp-filter/arch-support.txt @@ -14,7 +14,7 @@ | h8300: | TODO | | hexagon: | TODO | | ia64: | TODO | - | m68k: | TODO | + | m68k: | ok | | microblaze: | TODO | | mips: | ok | | nds32: | TODO | diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 372e4e6..deaea88 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -19,6 +19,8 @@ config M68K select GENERIC_STRNCPY_FROM_USER if MMU select GENERIC_STRNLEN_USER if MMU select HAVE_AOUT if MMU + select HAVE_ARCH_SECCOMP + select HAVE_ARCH_SECCOMP_FILTER select HAVE_ASM_MODVERSIONS select HAVE_DEBUG_BUGVERBOSE select HAVE_FUTEX_CMPXCHG if MMU && FUTEX diff --git a/arch/m68k/include/asm/seccomp.h b/arch/m68k/include/asm/seccomp.h new file mode 100644 index 0000000..de8a94e --- /dev/null +++ b/arch/m68k/include/asm/seccomp.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASM_SECCOMP_H +#define _ASM_SECCOMP_H + +#include + +#define SECCOMP_ARCH_NATIVE AUDIT_ARCH_M68K +#define SECCOMP_ARCH_NATIVE_NR NR_syscalls +#define SECCOMP_ARCH_NATIVE_NAME "m68k" + +#endif /* _ASM_SECCOMP_H */ diff --git a/arch/m68k/include/asm/syscall.h b/arch/m68k/include/asm/syscall.h index 465ac03..ab8ab94e 100644 --- a/arch/m68k/include/asm/syscall.h +++ b/arch/m68k/include/asm/syscall.h @@ -4,6 +4,39 @@ #include +#include + +extern const unsigned long sys_call_table[]; + +static inline int syscall_get_nr(struct task_struct *task, + struct pt_regs *regs) +{ + return regs->orig_d0; +} + +static inline void syscall_rollback(struct task_struct *task, + struct pt_regs *regs) +{ + regs->d0 = regs->orig_d0; +} + +static inline void syscall_set_return_value(struct task_struct *task, + struct pt_regs *regs, + int error, long val) +{ + regs->d0 = (long) error ? error : val; +} + +static inline void syscall_get_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned long *args) +{ + args[0] = regs->orig_d0; + args++; + + memcpy(args, ®s->d1, 5 * sizeof(args[0])); +} + static inline int syscall_get_arch(struct task_struct *task) { return AUDIT_ARCH_M68K; diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h index 15a7570..d813fed 100644 --- a/arch/m68k/include/asm/thread_info.h +++ b/arch/m68k/include/asm/thread_info.h @@ -64,6 +64,7 @@ static inline struct thread_info *current_thread_info(void) #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */ #define TIF_SIGPENDING 6 /* signal pending */ #define TIF_NEED_RESCHED 7 /* rescheduling necessary */ +#define TIF_SECCOMP 13 /* seccomp syscall filtering active */ #define TIF_DELAYED_TRACE 14 /* single step a syscall */ #define TIF_SYSCALL_TRACE 15 /* syscall trace active */ #define TIF_MEMDIE 16 /* is terminating due to OOM killer */ @@ -72,6 +73,7 @@ static inline struct thread_info *current_thread_info(void) #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) +#define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_DELAYED_TRACE (1 << TIF_DELAYED_TRACE) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_MEMDIE (1 << TIF_MEMDIE) diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c index 74d58a8..bc2490c 100644 --- a/arch/m68k/kernel/ptrace.c +++ b/arch/m68k/kernel/ptrace.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -277,6 +278,10 @@ asmlinkage int syscall_trace_enter(void) if (test_thread_flag(TIF_SYSCALL_TRACE)) ret = tracehook_report_syscall_entry(task_pt_regs(current)); + + if (secure_computing() == -1) + return -1; + return ret; } -- 2.7.4