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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 C962FC43441 for ; Wed, 14 Nov 2018 23:40:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 85F5F2086B for ; Wed, 14 Nov 2018 23:40:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b="CVE0dams" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85F5F2086B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726604AbeKOJqJ (ORCPT ); Thu, 15 Nov 2018 04:46:09 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:42348 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725952AbeKOJqJ (ORCPT ); Thu, 15 Nov 2018 04:46:09 -0500 Received: by mail-pf1-f195.google.com with SMTP id 64so4224035pfr.9 for ; Wed, 14 Nov 2018 15:40:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=HDqZJVfDdm2xKhPSrI3qoQN8wl9PNy37Pa6VpKminmk=; b=CVE0damsV0qsfxURG7UJ6WvJvZL2xMpiI+faKFoYznrWRqwrqWF+FKimZZGuAVns2o xNRZVvOIuyLilK68Aaz6DzQM+c3/aG1v8VwCP/BVsPokpaXMGrwPkuYkXWiaIntvfCt2 5weNY6m0CVvRtKNv6fl41JeIr9Flzwfc8Nz2Pew2eBJImPbfD7UIYuB67ybusv4frZaj TQB/jxvwPhCcjSVJMhmhvrDFy4ZfpX1q/vaHXR0mDastbyJicBCiuBVDz1PFmMO7e4WU ArlblZJ63Iev9RCPkv/aDbjp1Zyim1vljvP5srl5VCnXDZDuAZQhxJm1/wyhPlJyIDW4 breA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=HDqZJVfDdm2xKhPSrI3qoQN8wl9PNy37Pa6VpKminmk=; b=cQ+CNs9azLXLB9naosSof9ntesR0L+FYhK1LcHtw+tjUAY44idF3Cao2TNq5hJBVC8 TmluWhd5a1kRhaknfXoWqrUFiqcnS2wfmOIjeg9/Vs0zBOH4Khdy/9aEwgUyA3TeGhRX vHgSoJsNKOgOpk0Wcl8dP5VuOIrefzDu3AI/PruSAlp1pilMQttr02AvlNbLyMts0p67 aTrSZs+mmeZj/m0XPh+1+Fd0W94Ow0/QCUlPjKzZu1D4r9nvftdm1TBskHF9iyIuSrKu 7AFrMzoEHg6lauFQHKF69BbRClvlJ/Uts4OWP7cQE15j/aeuDxT0sgWT0avdGF7wN+fZ 06AA== X-Gm-Message-State: AGRZ1gK6Lyf/1ovavR7D802ZcltYvy4HUE4tD7dYCu60Con9+2ve1wOC zj8pIdHCBMa6GNBxcklZAbw9dg== X-Google-Smtp-Source: AJdET5c4p69A/T4S79dnLW/b+BDnzfKMhBjf1BLdGoKTbjRKPdZ28swD68Ppvoj/Gw+CmNAXsH30tQ== X-Received: by 2002:a63:5a57:: with SMTP id k23mr3598535pgm.5.1542238843505; Wed, 14 Nov 2018 15:40:43 -0800 (PST) Received: from localhost ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id m85-v6sm23480771pfj.171.2018.11.14.15.40.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 15:40:42 -0800 (PST) Date: Wed, 14 Nov 2018 15:40:42 -0800 (PST) X-Google-Original-Date: Wed, 14 Nov 2018 14:45:14 PST (-0800) Subject: Re: [PATCH 1/2] riscv: add audit support In-Reply-To: CC: david.abdurachmanov@gmail.com, linux-riscv@lists.infradead.org, aou@eecs.berkeley.edu, linux-kernel@vger.kernel.org, linux-audit@redhat.com From: Palmer Dabbelt To: paul@paul-moore.com Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 13 Nov 2018 15:34:18 PST (-0800), paul@paul-moore.com wrote: > On Tue, Nov 13, 2018 at 5:07 AM Palmer Dabbelt wrote: >> On Mon, 29 Oct 2018 03:48:53 PDT (-0700), david.abdurachmanov@gmail.com wrote: >> > On RISC-V (riscv) audit is supported through generic lib/audit.c. >> > The patch adds required arch specific definitions. >> > >> > Signed-off-by: David Abdurachmanov >> > --- >> > arch/riscv/Kconfig | 1 + >> > arch/riscv/include/asm/ptrace.h | 5 +++++ >> > arch/riscv/include/asm/syscall.h | 10 ++++++++++ >> > arch/riscv/include/asm/thread_info.h | 6 ++++++ >> > arch/riscv/kernel/entry.S | 4 ++-- >> > include/uapi/linux/audit.h | 2 ++ >> > 6 files changed, 26 insertions(+), 2 deletions(-) >> > >> > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig >> > index a344980287a5..8e6d404a4ed0 100644 >> > --- a/arch/riscv/Kconfig >> > +++ b/arch/riscv/Kconfig >> > @@ -28,6 +28,7 @@ config RISCV >> > select GENERIC_STRNLEN_USER >> > select GENERIC_SMP_IDLE_THREAD >> > select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A >> > + select HAVE_ARCH_AUDITSYSCALL >> > select HAVE_MEMBLOCK >> > select HAVE_MEMBLOCK_NODE_MAP >> > select HAVE_DMA_CONTIGUOUS >> > diff --git a/arch/riscv/include/asm/ptrace.h b/arch/riscv/include/asm/ptrace.h >> > index 2c5df945d43c..62c5e9d35596 100644 >> > --- a/arch/riscv/include/asm/ptrace.h >> > +++ b/arch/riscv/include/asm/ptrace.h >> > @@ -113,6 +113,11 @@ static inline void frame_pointer_set(struct pt_regs *regs, >> > SET_FP(regs, val); >> > } >> > >> > +static inline unsigned long regs_return_value(struct pt_regs *regs) >> > +{ >> > + return regs->a0; >> > +} >> > + >> > #endif /* __ASSEMBLY__ */ >> > >> > #endif /* _ASM_RISCV_PTRACE_H */ >> > diff --git a/arch/riscv/include/asm/syscall.h b/arch/riscv/include/asm/syscall.h >> > index 8d25f8904c00..bba3da6ef157 100644 >> > --- a/arch/riscv/include/asm/syscall.h >> > +++ b/arch/riscv/include/asm/syscall.h >> > @@ -18,6 +18,7 @@ >> > #ifndef _ASM_RISCV_SYSCALL_H >> > #define _ASM_RISCV_SYSCALL_H >> > >> > +#include >> > #include >> > #include >> > >> > @@ -99,4 +100,13 @@ static inline void syscall_set_arguments(struct task_struct *task, >> > memcpy(®s->a1 + i * sizeof(regs->a1), args, n * sizeof(regs->a0)); >> > } >> > >> > +static inline int syscall_get_arch(void) >> > +{ >> > +#ifdef CONFIG_64BIT >> > + return AUDIT_ARCH_RISCV64; >> > +#else >> > + return AUDIT_ARCH_RISCV32; >> > +#endif >> > +} >> > + >> > #endif /* _ASM_RISCV_SYSCALL_H */ >> > diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h >> > index f8fa1cd2dad9..1c9cc8389928 100644 >> > --- a/arch/riscv/include/asm/thread_info.h >> > +++ b/arch/riscv/include/asm/thread_info.h >> > @@ -80,13 +80,19 @@ struct thread_info { >> > #define TIF_RESTORE_SIGMASK 4 /* restore signal mask in do_signal() */ >> > #define TIF_MEMDIE 5 /* is terminating due to OOM killer */ >> > #define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */ >> > +#define TIF_SYSCALL_AUDIT 7 /* syscall auditing */ >> > >> > #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) >> > #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) >> > #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) >> > #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) >> > +#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT) >> > +#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) >> > >> > #define _TIF_WORK_MASK \ >> > (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | _TIF_NEED_RESCHED) >> > >> > +#define _TIF_SYSCALL_WORK \ >> > + (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT) >> > + >> > #endif /* _ASM_RISCV_THREAD_INFO_H */ >> > diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S >> > index fa2c08e3c05e..2a6c2e7aaff3 100644 >> > --- a/arch/riscv/kernel/entry.S >> > +++ b/arch/riscv/kernel/entry.S >> > @@ -202,7 +202,7 @@ handle_syscall: >> > REG_S s2, PT_SEPC(sp) >> > /* Trace syscalls, but only if requested by the user. */ >> > REG_L t0, TASK_TI_FLAGS(tp) >> > - andi t0, t0, _TIF_SYSCALL_TRACE >> > + andi t0, t0, _TIF_SYSCALL_WORK >> > bnez t0, handle_syscall_trace_enter >> > check_syscall_nr: >> > /* Check to make sure we don't jump to a bogus syscall number. */ >> > @@ -222,7 +222,7 @@ ret_from_syscall: >> > REG_S a0, PT_A0(sp) >> > /* Trace syscalls, but only if requested by the user. */ >> > REG_L t0, TASK_TI_FLAGS(tp) >> > - andi t0, t0, _TIF_SYSCALL_TRACE >> > + andi t0, t0, _TIF_SYSCALL_WORK >> > bnez t0, handle_syscall_trace_exit >> > >> > ret_from_exception: >> > diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h >> > index 818ae690ab79..d0e037a96a7b 100644 >> > --- a/include/uapi/linux/audit.h >> > +++ b/include/uapi/linux/audit.h >> > @@ -399,6 +399,8 @@ enum { >> > /* do not define AUDIT_ARCH_PPCLE since it is not supported by audit */ >> > #define AUDIT_ARCH_PPC64 (EM_PPC64|__AUDIT_ARCH_64BIT) >> > #define AUDIT_ARCH_PPC64LE (EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) >> > +#define AUDIT_ARCH_RISCV32 (EM_RISCV|__AUDIT_ARCH_LE) >> > +#define AUDIT_ARCH_RISCV64 (EM_RISCV|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) >> > #define AUDIT_ARCH_S390 (EM_S390) >> > #define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT) >> > #define AUDIT_ARCH_SH (EM_SH) >> >> I can't seem to figure out how to dig the rest of the thread out of my inbox >> (I'm in an airport), so I'm just replying here. >> >> I've added this to next-audit, which will soon filter into for-next. I'm not >> sure if this is 100% settled, but I can't find any issues with it so I think >> it's best to get this out for testing. > > If you RISCV guys are happy, and it is passing the audit-testsuite > (which I believe it is based on some brief discussions with David on > Freenode), then I think it is okay from my point of view. I haven't run the test suite personally, but I trust that David has done so if he said so (I remember having seen him say he did as well). Thanks!