From patchwork Wed Mar 22 20:38:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9640037 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 58BAB60327 for ; Wed, 22 Mar 2017 20:46:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48B7A27D45 for ; Wed, 22 Mar 2017 20:46:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CBFE28461; Wed, 22 Mar 2017 20:46:28 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID autolearn=unavailable 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 D5B3D27D45 for ; Wed, 22 Mar 2017 20:46:27 +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=/AzxFuuPPwEM0Ee7Y3lFQSjeXIe/9S/o9HELJe+XMF8=; b=dvvan/Y1IIsnc7UYSM0mQpjQJS ZsxZmJpiJbxLGZNJUO5f3klhgdVBNHcNU709xLKyJOd36ZSo1Eb1l2o2SCmzAV3c+qN7Q9G5Or3ny 23VdAdOkuoEWuseTXqyPYuZtU3RjinXAFMohbiU26LtyHJKLQ18PkvEA9dRqY3o+9URRmr9tryCJq 5BySL6lP6VkGHjOPBVqYK0BDOOLEZ9Q4IMvOI3eT/UT1u0lRyq7AHXbJB6dYUJyOzv2EobQTigMqm 5W4me1my6ZidSopQUMSvuW7+Q6EOGHAgJS8RdQ3A06I7r8ETDERvBnHDrXB8abp0GcRlHlVaZTlhs GTRM/uQg==; 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 1cqn9F-0006wf-QO; Wed, 22 Mar 2017 20:46:25 +0000 Received: from mail-pf0-x234.google.com ([2607:f8b0:400e:c00::234]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqn2C-0002D9-FS for linux-arm-kernel@lists.infradead.org; Wed, 22 Mar 2017 20:39:10 +0000 Received: by mail-pf0-x234.google.com with SMTP id 20so48460250pfk.2 for ; Wed, 22 Mar 2017 13:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VbbJJAG/cMTHq+tAgPiQEmcqCEMYwnthiCRS2xg1jUQ=; b=lJ3bGF+Fe8tenkbn4Ipvc1Lu8olxzaUV5uaRkupr9RpZP4TXbtNG0Kt4FD72bBXbPa QMyvdfGacO9+jbsh/JxMF4bbPIfdL2OUnukeT79vEF7EeVix6GJEd520JoT1BSkWEeRW 3dvWgnkITJqotj23V9pdkQexjVIJfXtP6cMX5Vxkwqva0eLFr/mJeMUPjc6Ngj4VT6jC Rv0+4KuNSzZ/eoWI3nip+18XyEU4X1zNLBIKEimAWmKHGsEZRk4Dj7ZG13HJcOI672lT 2k0E6m5bP6Nv5fnbV4a2R1GChxLIB/XRUMpT5NrFl1jL+k4IuMk79B2qGNesUsDE5RM+ NU/A== 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=VbbJJAG/cMTHq+tAgPiQEmcqCEMYwnthiCRS2xg1jUQ=; b=It1RoNirLn2Em3XevohoLOp0AGD2RAAuxChQmEZ4+pDdV48PD+3FE42Tv4qJz/CmNP nkqk149PGMkUBlF9aQUbZrHlDw+DvSJSzi3F7ZbSAVkooDOqaYhLg+j+CCkyDzN1+JAm T9JIT/XdM2fap9uSDJNbpsLyMZ5cim1ri+0Vtoekwl017IbQaRE6OMjetqxkDYLrU4uN JeYX7GQLfV+unx4GWuxge020BRePbBBRvC8688id6wUjrHkbE0hx/96zAGjlQQmjsQbe NDy7BLgjI410CD/IAbAKZfSuwVOe+RIaI6SBsvLQ9ujG+mqyVxM90CqyP5IhDwKdbSGp +iHg== X-Gm-Message-State: AFeK/H3XKOWhkow2a8bX5SYkO5ocVLI6gvd51qKwWa0SOSQ4z3O+rSfpxsFaSD7BvSOyZY8d X-Received: by 10.99.36.194 with SMTP id k185mr13158880pgk.201.1490215127301; Wed, 22 Mar 2017 13:38:47 -0700 (PDT) Received: from skynet.sea.corp.google.com ([100.100.206.164]) by smtp.gmail.com with ESMTPSA id x21sm5630781pfa.71.2017.03.22.13.38.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 13:38:46 -0700 (PDT) From: Thomas Garnier To: Martin Schwidefsky , Heiko Carstens , Dave Hansen , David Howells , Al Viro , Arnd Bergmann , Thomas Garnier , =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= , Andrew Morton , "Paul E . McKenney" , Ingo Molnar , Thomas Gleixner , Oleg Nesterov , Pavel Tikhomirov , Stephen Smalley , Ingo Molnar , "H . Peter Anvin" , Andy Lutomirski , Paolo Bonzini , Rik van Riel , Kees Cook , Josh Poimboeuf , Borislav Petkov , Brian Gerst , "Kirill A . Shutemov" , Christian Borntraeger , Russell King , Vladimir Murzin , Will Deacon , Catalin Marinas , Mark Rutland , James Morse Subject: [PATCH v4 3/4] arm/syscalls: Specific usage of verify_pre_usermode_state Date: Wed, 22 Mar 2017 13:38:33 -0700 Message-Id: <20170322203834.67556-3-thgarnie@google.com> X-Mailer: git-send-email 2.12.1.500.gab5fba24ee-goog In-Reply-To: <20170322203834.67556-1-thgarnie@google.com> References: <20170322203834.67556-1-thgarnie@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170322_133908_553560_556D2E6D X-CRM114-Status: GOOD ( 15.30 ) 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: linux-s390@vger.kernel.org, kernel-hardening@lists.openwall.com, linux-api@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, 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 Implement specific usage of verify_pre_usermode_state for user-mode returns for arm. --- Based on next-20170322 --- arch/arm/Kconfig | 1 + arch/arm/include/asm/domain.h | 3 +++ arch/arm/kernel/entry-common.S | 32 +++++++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fcbc5ef1ec69..10c6dc3dfff9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -12,6 +12,7 @@ config ARM select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_NO_SYSCALL_VERIFY_PRE_USERMODE_STATE select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7 select ARCH_SUPPORTS_ATOMIC_RMW diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h index 99d9f630d6b6..fd1cd24ca9fe 100644 --- a/arch/arm/include/asm/domain.h +++ b/arch/arm/include/asm/domain.h @@ -58,6 +58,9 @@ #define domain_mask(dom) ((3) << (2 * (dom))) #define domain_val(dom,type) ((type) << (2 * (dom))) +#define DOMAIN_KERNEL_MASK domain_mask(DOMAIN_KERNEL) +#define DOMAIN_CLIENT_VALUE domain_val(DOMAIN_KERNEL, DOMAIN_CLIENT) + #ifdef CONFIG_CPU_SW_DOMAIN_PAN #define DACR_INIT \ (domain_val(DOMAIN_USER, DOMAIN_NOACCESS) | \ diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index eb5cd77bf1d8..8d9bfe9ff313 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -12,6 +12,7 @@ #include #include #include +#include #ifdef CONFIG_AEABI #include #endif @@ -27,7 +28,6 @@ #include "entry-header.S" - .align 5 #if !(IS_ENABLED(CONFIG_TRACE_IRQFLAGS) || IS_ENABLED(CONFIG_CONTEXT_TRACKING)) /* @@ -40,9 +40,12 @@ ret_fast_syscall: UNWIND(.fnstart ) UNWIND(.cantunwind ) disable_irq_notrace @ disable interrupts + ldr r2, [tsk, #TI_ADDR_LIMIT] ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK bne fast_work_pending + cmp r2, #TASK_SIZE + blne addr_limit_fail /* perform architecture specific actions before user return */ arch_ret_to_user r1, lr @@ -66,6 +69,7 @@ ret_fast_syscall: UNWIND(.cantunwind ) str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 disable_irq_notrace @ disable interrupts + ldr r2, [tsk, #TI_ADDR_LIMIT] ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK beq no_work_pending @@ -82,6 +86,7 @@ slow_work_pending: mov r2, why @ 'syscall' bl do_work_pending cmp r0, #0 + ldreq r2, [tsk, #TI_ADDR_LIMIT] beq no_work_pending movlt scno, #(__NR_restart_syscall - __NR_SYSCALL_BASE) ldmia sp, {r0 - r6} @ have to reload r0 - r6 @@ -99,9 +104,12 @@ ret_slow_syscall: disable_irq_notrace @ disable interrupts ENTRY(ret_to_user_from_irq) ldr r1, [tsk, #TI_FLAGS] + ldr r2, [tsk, #TI_ADDR_LIMIT] tst r1, #_TIF_WORK_MASK bne slow_work_pending no_work_pending: + cmp r2, #TASK_SIZE + blne addr_limit_fail asm_trace_hardirqs_on save = 0 /* perform architecture specific actions before user return */ @@ -125,6 +133,28 @@ ENTRY(ret_from_fork) b ret_slow_syscall ENDPROC(ret_from_fork) +addr_limit_fail: +#ifdef CONFIG_BUG_ON_DATA_CORRUPTION + stmfd sp!, {r0, lr} + bl verify_pre_usermode_state + ldmfd sp!, {r0, lr} +#else + /* + * Similar to set_fs(USER_DS) in verify_pre_usermode_state without a + * warning. + */ + mov r2, #TASK_SIZE + str r2, [tsk, #TI_ADDR_LIMIT] +#ifdef CONFIG_CPU_USE_DOMAINS + /* Switch domain like modify_domain(DOMAIN_KERNEL, DOMAIN_CLIENT) */ + mrc p15, 0, r2, c3, c0, 0 @ Get domain register + bic r2, r2, #DOMAIN_KERNEL_MASK @ Clear the domain part + orr r2, r2, #DOMAIN_CLIENT_VALUE @ Enforce DOMAIN_CLIENT + mcr p15, 0, r2, c3, c0, 0 @ Set domain register +#endif +#endif + ret lr + /*============================================================================= * SWI handler *-----------------------------------------------------------------------------