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 53EECC388F9 for ; Thu, 12 Nov 2020 00:19:38 +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 B921820791 for ; Thu, 12 Nov 2020 00:19:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ASdTS8Gp"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="OaS8OCI9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B921820791 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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=/j1gjbQ4XQVLtXFzaM/khKAOuBFFHSbyu6U5AWg5RGo=; b=ASdTS8Gp4d3NcnQLDRvc0KXky fzFjGbFCeovpRodj1bjGVjEL5n3ht1OwSZ3hPGz8HfGCF4T1j3HYcgxzG6HRBimmwwDKO0Rkl5bc3 6Ff+0TfaossWxPwhjeQBPFBmjYEY5YveD9OIL3P/95MbUQ3iZ098CvxUraIAzAiLazX32gSI+bc/h TcwObFPtsSwbtmZGY1hzEqWsrbFp5dtxH5wtJtxB1i76B2ZZX72ykkg0AJzIEdu4qqlf1W5H2QmOv AFz3/svzhTKxCOCZjTbX1OAWX5unWaFjkLJuCM1AKsp3DpSwYZUczKx51DGF0TTwbb2QHvajdHJ9J 9tUXj7lwQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kd0KQ-0001ll-GJ; Thu, 12 Nov 2020 00:19:06 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kd0KO-0001lK-CY for linux-arm-kernel@lists.infradead.org; Thu, 12 Nov 2020 00:19:05 +0000 Received: by mail-pl1-x641.google.com with SMTP id g11so1833147pll.13 for ; Wed, 11 Nov 2020 16:19:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=LtCB6ZCF5AGvMeS9/icU9Rx1IjLI7o2d2+oG/pddwrw=; b=OaS8OCI9vb4kX6A8hupmj8NATt3fN/fgdTiQcAD1/I6BOuJtVeBmYKpIfu2F3qcqzR eoTGEp9h8KeTFRsVOWOaV8C86OTlRGI6nzhp5AlfFoqLV3+DTgYfo6ZX2vzN2TsKr1KF MljKYMnhYJHUDG21TW1ClzitF5AxABIlSe/sg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=LtCB6ZCF5AGvMeS9/icU9Rx1IjLI7o2d2+oG/pddwrw=; b=sfvPoOP0FarCKElFu8BsR8QTDuUWwPkOSr1R2zccdZ+XePQk7GlyeP2iT2PdgXhvrM k4X89+AA+QsaekQgUpxxvkSnSNB5LlpA9CaxGaBbyuRz0MlnKRU/h9u1f849TPVfTRNH pxBt3ww9IF7LYeLmmI2hz+YHG/ibz3K7wbMPFFz6v9kCMCc4EQq0ZbNSUD64Kp939WR/ DK/gEvr6Sfy++cSCrVgSx8XAZpTlVLY638NlQVs18u5/NdTLiYBs5urWYJpFDqt47/4l 26WS/3pi+XHgQjcmdpB2NTYS5okHrc0SiqAWt5YYWlTXzQqIVYpxlVWxDb1NCOnrrQqg nNmQ== X-Gm-Message-State: AOAM5315PlVYYx8yVIMUX3gQ6MVmc5osbIkuIt9L8OUf8B97p8DrXxKI 74kXjH5VUyWzHhh6mLv4i2gEmA== X-Google-Smtp-Source: ABdhPJy98FONnxapcMcTx6KXTK44zmyO5NEg2p5+rPybfcQDvSFSP+aBjDKSJ/YVgs6sXsi40n6ejA== X-Received: by 2002:a17:902:7482:b029:d6:682d:5c6c with SMTP id h2-20020a1709027482b02900d6682d5c6cmr22661750pll.84.1605140340819; Wed, 11 Nov 2020 16:19:00 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id j12sm4040230pfd.203.2020.11.11.16.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 16:18:59 -0800 (PST) Date: Wed, 11 Nov 2020 16:18:58 -0800 From: Kees Cook To: Catalin Marinas Subject: Re: [PATCH 1/2] arm64: Enable seccomp architecture tracking Message-ID: <202011111618.8315C4F4@keescook> References: <20201028002000.2666043-1-keescook@chromium.org> <20201028002000.2666043-2-keescook@chromium.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_191904_493184_737F0F6B X-CRM114-Status: GOOD ( 21.46 ) 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, Nov 10, 2020 at 05:26:38PM +0000, Catalin Marinas wrote: > 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) Ah yes, I was thinking of the arch/arm64 name. :) I will fix this. > > > +# 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? Heh, again, sorry -- I'm so used to the 32/64 being combined as I did the other architectures. I'll fix this too. Thanks! -- Kees Cook _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel