From patchwork Tue Apr 4 17:47:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9662285 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 A20B86032D for ; Tue, 4 Apr 2017 17:48:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9521C283A6 for ; Tue, 4 Apr 2017 17:48:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89C1428520; Tue, 4 Apr 2017 17:48:26 +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=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 0EBAF283A6 for ; Tue, 4 Apr 2017 17:48:26 +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=KAV2gl4mq01ehQ37lNZ4vuVrtvcAZQyMZ7tXTXURfgo=; b=fcjWw+ZV6XBW6WeeF4RiediP9g gV0IaMk1WCQgOmR8gMQIn4qei0VHms/EyRuAX8o+PUFIpzGL4mqxIi3dwf1pO8aH1av3tfeHmiR2j PebW8pBelqoGwhnamd4Qia/KgtCBU0f00unItGH5/5GWS3Ozcm4bo13Wy3jxOIPtXpthNXD/x454Y CE77n6CsxJSSO6Z88+pL+K0UMAlx6CRSPW5mL0g0xpo5+XP16odwXPkdg3lA05i7kf6ybj2jykJl+ LBnvavDe+8qxTmpg18p7+/3BJVkirEx0AvyHI0eA3zJUuA1+ITqhZcheGUqQyxyHuBWxAchbjYmOW qhj+AfAA==; 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 1cvSZ6-0004t5-99; Tue, 04 Apr 2017 17:48:24 +0000 Received: from mail-pg0-x236.google.com ([2607:f8b0:400e:c05::236]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvSYg-0004Lb-NK for linux-arm-kernel@lists.infradead.org; Tue, 04 Apr 2017 17:48:00 +0000 Received: by mail-pg0-x236.google.com with SMTP id x125so159204404pgb.0 for ; Tue, 04 Apr 2017 10:47:38 -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=VJiuTWOmO1JqZjIphy1Kmldf1Ytte2PfX2FNI2PFK/4=; b=LLMkZ9WGGrTowjRY+OEzxmK+MmE63hvvuoBRTM4tI1wdKnb27/nPpZX80IWGH7jyKx lZgTzT7ho/DWISuWIn2Z3prL+a1H2c5jBU+NHDXBISaRjLoDZz+XdpYdRh7beDfqAD2t GRp27f8s7uheyf/1ADe15xlafvW5cX3Eof779KwRPSlZfpvvN+QovO4j2RNqcCYACPYV 0AoXc48QvlWs1WpkZfU2IDr1aQYdReX+2tlo0IA00/qp2hOpNrMcx9Vh9hYjopKjxGBF jxLPEakDpXMIYHAwuwbkCmpywmVwa7PzefceH+/piNHBJud1gOEjs4ReazE6G+0a1L0x ZOBg== 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=VJiuTWOmO1JqZjIphy1Kmldf1Ytte2PfX2FNI2PFK/4=; b=qLPmHOOjv9KxPVVxhi9P7GEJNLE3rw431ia8yaBRaNXgxHS4w/T25MFYUm3wJMHQGS Y5CKhetFfRcjbRDVGGwy04Ux6m1YJtxCPODIBhuEPvKM8u1ZQO9aLRZdJnz7YC9RIE3W ucGUj/Fi8sHkux+Q3pjw0DeBz9kO0r+TUjgQ6vd09q3Rm1IbjLFa/OTjIp16pIiUAqMN HIEqrItG7lyRpp/hH5qlRGFzDrDcUbmyCtnRFapgiRxKLTW5whfqdc5aOmkXfktUpEaw FTuoJvxI9iMYa81F3h6LGshdF7+DiHp8ZZbJD7TeguQzmmFoZ71iQQv2xnhw1ITbFyfQ /dLA== X-Gm-Message-State: AFeK/H2gysGw0okcpuPrg60uBamCSagYTgF6tb908BtFYFJ096SaZTU/iTOoSnuuGDNJ9FIv X-Received: by 10.84.211.130 with SMTP id c2mr30692750pli.82.1491328057797; Tue, 04 Apr 2017 10:47:37 -0700 (PDT) Received: from skynet.sea.corp.google.com ([100.100.206.164]) by smtp.gmail.com with ESMTPSA id m69sm32969834pfc.33.2017.04.04.10.47.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Apr 2017 10:47:37 -0700 (PDT) From: Thomas Garnier To: Martin Schwidefsky , Heiko Carstens , Dave Hansen , Arnd Bergmann , Thomas Gleixner , Al Viro , David Howells , Thomas Garnier , =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= , Andrew Morton , "Paul E . McKenney" , Ingo Molnar , Oleg Nesterov , Stephen Smalley , Pavel Tikhomirov , Ingo Molnar , "H . Peter Anvin" , Andy Lutomirski , Paolo Bonzini , Kees Cook , Rik van Riel , Josh Poimboeuf , Borislav Petkov , Brian Gerst , "Kirill A . Shutemov" , Christian Borntraeger , Russell King , Will Deacon , Catalin Marinas , Mark Rutland , James Morse Subject: [PATCH v6 3/4] arm/syscalls: Specific usage of verify_pre_usermode_state Date: Tue, 4 Apr 2017 10:47:26 -0700 Message-Id: <20170404174727.35478-3-thgarnie@google.com> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog In-Reply-To: <20170404174727.35478-1-thgarnie@google.com> References: <20170404174727.35478-1-thgarnie@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170404_104758_790119_A9942961 X-CRM114-Status: GOOD ( 14.23 ) 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. Signed-off-by: Thomas Garnier --- Based on next-20170404 --- arch/arm/Kconfig | 1 + arch/arm/kernel/entry-common.S | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2cec306c7390..e2ebc7d37742 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/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index eb5cd77bf1d8..88c72c4e44ad 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,12 @@ ENTRY(ret_from_fork) b ret_slow_syscall ENDPROC(ret_from_fork) +addr_limit_fail: + stmfd sp!, {r0, lr} + bl asm_verify_pre_usermode_state + ldmfd sp!, {r0, lr} + ret lr + /*============================================================================= * SWI handler *-----------------------------------------------------------------------------