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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,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 58592C388F7 for ; Tue, 10 Nov 2020 17:27:10 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C348E206B2 for ; Tue, 10 Nov 2020 17:27:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cIeoi+Pg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C348E206B2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Z6W4l2amVGTCbQxhuL6SfxsHIdb0aGpLIHGblrgATiM=; b=cIeoi+PgRKKqsP8BDRV6bQgIh oVr6RowYqDoB2g8NQqUWQMa8WZsbemubnYVDpR9B9/NSyGm02U1C6cKBDO6extw6gflx2PzOp8hxx Qt/GfVpwuBw49nIlooiwR4gYsXyJxdElZbJ5jnwLs54WBo8ZVKzbkiI8RTbHk16ntZhHf8SBqBrLb R1W+LcO58sqrKoghE7k7ShZ27O4LFJC3gXJdlwe9ohNkn42nzTa818I8sZGfbXupaTisKg+kKoxbk ZIaQHh1eBRl8YXnEXMiePt5ADwjzbFiUixiKCfdjqz2gspV25E0V8Rs7xgivL+sFvx0W3NUINJ+Tc IMirVr7Pw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcXPp-00044D-GP; Tue, 10 Nov 2020 17:26:45 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcXPn-00043U-8G for linux-arm-kernel@lists.infradead.org; Tue, 10 Nov 2020 17:26:44 +0000 Received: from trantor (unknown [2.26.170.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A3BA4206B2; Tue, 10 Nov 2020 17:26:40 +0000 (UTC) Date: Tue, 10 Nov 2020 17:26:38 +0000 From: Catalin Marinas To: Kees Cook Subject: Re: [PATCH 1/2] arm64: Enable seccomp architecture tracking Message-ID: References: <20201028002000.2666043-1-keescook@chromium.org> <20201028002000.2666043-2-keescook@chromium.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201028002000.2666043-2-keescook@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201110_122643_463109_68A8F06C X-CRM114-Status: GOOD ( 18.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Will Drewry , YiFei Zhu , linux-kernel@vger.kernel.org, Russell King , Andy Lutomirski , Will Deacon , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Oct 27, 2020 at 05:19:59PM -0700, Kees Cook wrote: > To enable seccomp constant action bitmaps, we need to have a static > mapping to the audit architecture and system call table size. Add these > for arm64. > > Signed-off-by: Kees Cook > --- > arch/arm64/include/asm/seccomp.h | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/arm64/include/asm/seccomp.h b/arch/arm64/include/asm/seccomp.h > index c36387170936..40f325e7a404 100644 > --- a/arch/arm64/include/asm/seccomp.h > +++ b/arch/arm64/include/asm/seccomp.h > @@ -19,4 +19,19 @@ > > #include > > +#ifdef CONFIG_ARM64 > +# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_AARCH64 > +# define SECCOMP_ARCH_NATIVE_NR NR_syscalls > +# define SECCOMP_ARCH_NATIVE_NAME "arm64" "aarch64"? (to match ELF_PLATFORM; not sure what this is used for as SECCOMP_ARCH_NATIVE_NAME is not defined in 5.10-rc3) > +# ifdef CONFIG_COMPAT > +# define SECCOMP_ARCH_COMPAT AUDIT_ARCH_ARM > +# define SECCOMP_ARCH_COMPAT_NR __NR_compat_syscalls > +# define SECCOMP_ARCH_COMPAT_NAME "arm" > +# endif > +#else /* !CONFIG_ARM64 */ > +# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_ARM > +# define SECCOMP_ARCH_NATIVE_NR NR_syscalls > +# define SECCOMP_ARCH_NATIVE_NAME "arm" > +#endif Why do we need a !CONFIG_ARM64 in an arm64 header file? -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel