From: Catalin Marinas <catalin.marinas@arm.com>
To: Kees Cook <keescook@chromium.org>
Cc: YiFei Zhu <yifeifz2@illinois.edu>,
Russell King <linux@armlinux.org.uk>,
Will Deacon <will@kernel.org>,
Andy Lutomirski <luto@amacapital.net>,
Will Drewry <wad@chromium.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] arm64: Enable seccomp architecture tracking
Date: Tue, 10 Nov 2020 17:26:38 +0000 [thread overview]
Message-ID: <X6rNTgw8z4kreVD9@trantor> (raw)
In-Reply-To: <20201028002000.2666043-2-keescook@chromium.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 <keescook@chromium.org>
> ---
> 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 <asm-generic/seccomp.h>
>
> +#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
next prev parent reply other threads:[~2020-11-10 17:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 0:19 [PATCH 0/2] seccomp: Add arm and arm64 bitmap support Kees Cook
2020-10-28 0:19 ` [PATCH 1/2] arm64: Enable seccomp architecture tracking Kees Cook
2020-11-10 17:26 ` Catalin Marinas [this message]
2020-11-12 0:18 ` Kees Cook
2020-10-28 0:20 ` [PATCH 2/2] arm: " Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=X6rNTgw8z4kreVD9@trantor \
--to=catalin.marinas@arm.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=luto@amacapital.net \
--cc=wad@chromium.org \
--cc=will@kernel.org \
--cc=yifeifz2@illinois.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).