From patchwork Wed Oct 28 00:19:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 11862267 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=-12.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, 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 A95E2C55179 for ; Wed, 28 Oct 2020 00:20:46 +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 2502022281 for ; Wed, 28 Oct 2020 00:20:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GeVEeP7z"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Ip+vX9JL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2502022281 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:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MAxTkaYczfOYM9YWroBwVCN9vqY8b/WRt5WZOMUtp/I=; b=GeVEeP7zr4a/K7dV/j3j2Dbnx HLT/hPxlzgRBptLuULIeL1fc/PSlv8PPUxGEIa5iz/ly2wdw2SOh36bVXoOTUkVEPDwPJGKborvgu mHXblnUJv1amz8gj7jHHvQdJ7XiqlfVQT9qhEa+1tY1tbaEDwzDv5+c5Yos/f8wlWO56/rkCHvOyf wEpOM1A+nBmsVWGz4dYbcrfqozujLH6nSLIBfzIjMu6pNK/AY2E1NHzoK1DuiJw/UKhf+JdySaQ0R b7HbQgDjxAviOnwaWjwGXgRkHB27Ql4K3S1z3bfsc2200GUyBl6U0bt7jrTHKdAewBmUzlQmvKjIy cimegmyzQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXZCJ-00077i-C6; Wed, 28 Oct 2020 00:20:15 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXZCD-000763-Ui for linux-arm-kernel@lists.infradead.org; Wed, 28 Oct 2020 00:20:10 +0000 Received: by mail-pj1-x1041.google.com with SMTP id p21so1655183pju.0 for ; Tue, 27 Oct 2020 17:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zePcVpRarotahzKaCqRZdaRiSEtxo4yNeBKHniB4eyw=; b=Ip+vX9JL9N8kIaUG315SCQn7OHiL1Siu3qJGMMfD1qIc2wMLjGAf76ochUWLBx4b4c UH7oRFW+f9qhKEw8TsPIPiUmeVnU6cZryiX6HhRh9z+iuZrUzyHP1rDAoY9bS8xeTtGh wScjE5D6hmrl10gcmIv03ScLnPyG4hoTfiMOU= 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:mime-version:content-transfer-encoding; bh=zePcVpRarotahzKaCqRZdaRiSEtxo4yNeBKHniB4eyw=; b=OAzvMwaqPRfaSvBfHuiITJRcvNaboP8FDmmBD2jiY2WUENsVna63ghpXMz277/vdqe Wf9uTjigjDQSrd0t1CTGuLAewjY+IKwvRwBbivST7CDcZayf9ulXlXNdXC3t3HSUcRQk onaKiPEYz+0KeNX4ERa+ef0X0lkLlomrfSI2KWL5imSkO29Z400JOBrjVskXy3ApMPMO Gk8HF/nIG7TWgvijvU0tEi6blQ5K55UhhEc2ANj3ohZi6pNnpgTxhqOJXefZqDjK5Gwa A1a7VPAs0a8+ehClMxEOTHqqDkViYOHp1UQhmCieTJx2VjvTlI/MfBX3oRJDIsVrOLd1 7bHw== X-Gm-Message-State: AOAM530XbQJZyYkwiiKKmwAUgHQCemiPUUxckDTAkAHleK5u0zDjRpJi /bM4ghxwULUhND23WdbATrGBw2MwcUm16g== X-Google-Smtp-Source: ABdhPJyI+1hrqGTtsa7QmeTYy6tIsfzCNRfbTeJmr5zZ9RgR4ofeC4umHMgn4fZDY3IOEG5FjQWg7g== X-Received: by 2002:a17:902:8f96:b029:d6:293f:ed44 with SMTP id z22-20020a1709028f96b02900d6293fed44mr4985406plo.72.1603844406434; Tue, 27 Oct 2020 17:20:06 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id d145sm3776584pfd.136.2020.10.27.17.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 17:20:04 -0700 (PDT) From: Kees Cook To: YiFei Zhu Subject: [PATCH 1/2] arm64: Enable seccomp architecture tracking Date: Tue, 27 Oct 2020 17:19:59 -0700 Message-Id: <20201028002000.2666043-2-keescook@chromium.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201028002000.2666043-1-keescook@chromium.org> References: <20201028002000.2666043-1-keescook@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201027_202010_015555_6EDB2C57 X-CRM114-Status: GOOD ( 13.55 ) 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 , Kees Cook , Catalin Marinas , linux-kernel@vger.kernel.org, Russell King , Andy Lutomirski , Will Deacon , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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" +# 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 + #endif /* _ASM_SECCOMP_H */