From patchwork Wed Mar 29 18:16:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9652203 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8E56C602C8 for ; Wed, 29 Mar 2017 18:17:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7790C27165 for ; Wed, 29 Mar 2017 18:17:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C3D4284EF; Wed, 29 Mar 2017 18:17:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E49D027165 for ; Wed, 29 Mar 2017 18:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=uSu9zpWk+th3YeWbmNJ1gXufqpIb1uocaSQ8ncfwxD0=; b=q2s83l/jEhjw37/TL1zPwWFMNK oDzUYKrFdiA7loEIQeYiFF6gIoWa3RS9zzxLjTCOkBmV/WEc8QftmNQdInDf43ONZrStOqWZTqRUT 6dm07Y5HsFkQKTQZxTDydOq36JpoDEgD4O+SzYlrYluxSiHMfsx6YfB+ILaYe1zWioozW/kem+53b PURKp3dJ2TRMzscCnP6dUcZbGt1HRVbmmyiWXINA9L75JKZDmWLJiC2fK0D8KTAY3mujErL+f/O9v E/SB9y5p/25xS+/0Edf8j+KXYILAhWw+x15T3fO+BBl6eMJPDO6R/+9LVqZnVClAV4a50SrJwMlj5 7exjLHtQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ctI9o-0005mz-Fl; Wed, 29 Mar 2017 18:17:20 +0000 Received: from mail-pg0-x22d.google.com ([2607:f8b0:400e:c05::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ctI9F-00058O-0x for linux-arm-kernel@lists.infradead.org; Wed, 29 Mar 2017 18:16:47 +0000 Received: by mail-pg0-x22d.google.com with SMTP id 81so14646019pgh.2 for ; Wed, 29 Mar 2017 11:16:25 -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; bh=MqkxOKi/2mFKu7pPNBqiaH7NXqFpo6XauodqcOdgnEU=; b=NxTv+G9638ZP7LdpEeQa7pE2nUaH1TZzmDj4FEE9xi5xur+Jvp7TnIvJmzJ5/mIaSe 0jUVlPxr2yJ3yO2dSgXO78fSDtEb95vfva2YlV4z5TI+V/nC28ijIqFBIFXDX7tuLAYo /FbfyxqhjrFXh1vLv5ZHgI5tksaORKXRYaF68= 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; bh=MqkxOKi/2mFKu7pPNBqiaH7NXqFpo6XauodqcOdgnEU=; b=a1iZo9xLzZUKfh51hEOvdeDUsdGZfY4T1BwCLQmg+thZtaY2Ou1pxsPxlLEAE02FzX 2/qLATgEiGDRHf2INMrSQC3smv0JHd+bzoVzj9Vn7nvcSkHEmuJ3a1lZRpzk9ohyW8Hv 5mvoeegBgphFgaO5CNJLjuSoxS/lzewN6qNblDCPKWolijCZonqk3h84KqHHo0m0LbJp SFzzPxs9Xlbagm6Z+cGU1iA1zWGlFCcoKpElwi9Zx4k8LbpInuwZWBp6Py0ep0oz/ZDh NaJ6uponHyJ92OU0QDW7hCnTkjoxw0157TJIW5p08/tBizdtiHXZxQqnVG+iJPWj9p/A Aojg== X-Gm-Message-State: AFeK/H0Xe0eFwOBiV9gFHBDb4tkf5k/Jxg0LNUXHlWlIYP442osTaIIwpNpE3gXSIhytHxc8 X-Received: by 10.99.127.29 with SMTP id a29mr1866783pgd.11.1490811384964; Wed, 29 Mar 2017 11:16:24 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id r17sm14858129pgg.19.2017.03.29.11.16.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Mar 2017 11:16:23 -0700 (PDT) From: Kees Cook To: kernel-hardening@lists.openwall.com Subject: [RFC v2][PATCH 08/11] ARM: Implement __arch_rare_write_begin/end() Date: Wed, 29 Mar 2017 11:16:00 -0700 Message-Id: <1490811363-93944-9-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490811363-93944-1-git-send-email-keescook@chromium.org> References: <1490811363-93944-1-git-send-email-keescook@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170329_111645_235262_16587D59 X-CRM114-Status: GOOD ( 14.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Hoeun Ryu , Kees Cook , x86@kernel.org, Russell King , linux-kernel@vger.kernel.org, Emese Revfy , Andy Lutomirski , PaX Team , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Based on grsecurity's ARM pax_{open,close}_kernel() implementation, this allows HAVE_ARCH_RARE_WRITE to work on ARM. Signed-off-by: Kees Cook --- arch/arm/Kconfig | 1 + arch/arm/include/asm/domain.h | 3 ++- arch/arm/include/asm/pgtable.h | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0d4e71b42c77..57b8aeaf501c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -45,6 +45,7 @@ config ARM select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_MMAP_RND_BITS if MMU + select HAVE_ARCH_RARE_WRITE if MMU && !ARM_LPAE && !CPU_USE_DOMAINS select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) select HAVE_ARCH_TRACEHOOK select HAVE_ARM_SMCCC if CPU_V7 diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h index b5ca80ac823c..b3fb5c0a2efd 100644 --- a/arch/arm/include/asm/domain.h +++ b/arch/arm/include/asm/domain.h @@ -54,6 +54,7 @@ #define DOMAIN_MANAGER 3 #else #define DOMAIN_MANAGER 1 +#define DOMAIN_FORCE_MANAGER 3 #endif #define domain_mask(dom) ((3) << (2 * (dom))) @@ -118,7 +119,7 @@ static inline void set_domain(unsigned val) } #endif -#ifdef CONFIG_CPU_USE_DOMAINS +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_HAVE_ARCH_RARE_WRITE) #define modify_domain(dom,type) \ do { \ unsigned int domain = get_domain(); \ diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 1c462381c225..104923ea9eb5 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -57,6 +57,33 @@ extern void __pgd_error(const char *file, int line, pgd_t); #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd) #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd) +#ifdef CONFIG_HAVE_ARCH_RARE_WRITE +#include +#include + +static inline int test_domain(int domain, int domaintype) +{ + return (get_domain() & domain_val(domain, 3)) == + domain_val(domain, domaintype); +} + +static inline unsigned long __arch_rare_write_begin(void) +{ + preempt_disable(); + BUG_ON(test_domain(DOMAIN_WR_RARE, DOMAIN_FORCE_MANAGER)); + modify_domain(DOMAIN_WR_RARE, DOMAIN_FORCE_MANAGER); + return 0; +} + +static inline unsigned long __arch_rare_write_end(void) +{ + BUG_ON(test_domain(DOMAIN_WR_RARE, DOMAIN_CLIENT)); + modify_domain(DOMAIN_WR_RARE, DOMAIN_CLIENT); + preempt_enable_no_resched(); + return 0; +} +#endif + /* * This is the lowest virtual address we can permit any user space * mapping to be mapped at. This is particularly important for