From patchwork Wed Mar 8 21:38:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9612033 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 2682D60414 for ; Wed, 8 Mar 2017 21:40:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 176092862E for ; Wed, 8 Mar 2017 21:40:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0ACD82863D; Wed, 8 Mar 2017 21:40:54 +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 BA3D92862E for ; Wed, 8 Mar 2017 21:40:53 +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=9IpAYIa8Uvg9GnTYv3f9wAVNZ8igjslAwlVzZXFRilQ=; b=PmLibUiQbgCtKgYqeJzgfvqkeJ u2A6j+eGeR/9ShEttqe6mmSoIpiZWyCL1yUP1K4IOuM83hxHPzBBboDK0FghXRNbpMCUSTnQs3FO9 0EHR7RcUaCdERiPMTpPP26rPuEmV/aHmPU+Gi66JOQIpqV8CXqBl5ZoLT7bj8ZTsd5n9sl4pmUZ7D aNRsr1kR/wdl9kAL8RNSVE98apRgc64iHFQJi9UMft4juLusxr+TAOtKk3pkJZQo6hr1Qp7f6Cb/x 10v5H66ZzqZo3nLS/J6cWaPERJh6sbTlPSBHo8fD8r5SYQ9M6zshlmKeCM+dHrJ4x0MkwL1UWum1K 3Zj74MVQ==; 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 1cljKE-0002ei-Ti; Wed, 08 Mar 2017 21:40:50 +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 1cljIn-0000by-LY for linux-arm-kernel@lists.infradead.org; Wed, 08 Mar 2017 21:39:25 +0000 Received: by mail-pg0-x22d.google.com with SMTP id b129so17724851pgc.2 for ; Wed, 08 Mar 2017 13:39:03 -0800 (PST) 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=MCVtGXS+HInCk80dLY2Q1bGnevd3gzYhGZoT2/6F4ZI=; b=N/yvQW7H/nE3bluYr5d+Dl1tJnDQ4Pw9X0YW3TNCMAPgL4kdgCgvrUoDWtvWPqOwOy rlzoCTt3fJYQztEv3Bf4SpmYjyo8dZv3DRg6RPLRXF1XSwgKs2Lx1bgWccHthUOyvEZy MHbgoLkrIEHsqAlqzKnk/cO01SVg3y+7uMUgQPSr+s2Pju5/72IIUraVhIgfATT+C+rk sX2hdXAi1/DNwO2q2iu7lmHKua77oZ+RRrMDRDqAl5KOvYOSKPCK2ouEAL2SOgF1bYdQ Wiq8SoPrHRhNvtCU1MF/gU0eOy5UZz7bEZhKvVfKHmE9Tj9fySzJie1QFWXeIxAh/2ig RwoA== 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=MCVtGXS+HInCk80dLY2Q1bGnevd3gzYhGZoT2/6F4ZI=; b=eRPr+Fy41yDd1l+s7XFliXQZtS6EL6vkuInlX1weZUi7yAwBVJsdPVpOAgCLS00v69 Fimky3jmI2lPHMiURJTBbTpXxN2xGQUuOOHaNXOTXhy6nUYtKSIcITrrSqZOzdl/PdRw DxPeaCDD+oRaZ7qQnlLDxugnkNfVG1vWKSptkKRMSd11B5s2hdUH7CeTaRu23gc+GKsn Rtf2C6shqV1y3CAOVH8BDQfG23Wz8Fr9qSdsLK7+IKYkFOb2Iert29tT1pY9hycYAWGX T+4I+n54QU5hX+NbxNd9n4XjSNktZX+qG5RolYULMrO4svDzAuy7U+BVEQeOFGVCfbTU u1Ug== X-Gm-Message-State: AMke39mbXwv9Kvj0HZj91IekOPX9wgVxm6wzs1IjWrAaAy59gugr8TLI6b5dm6f0chu+DtEW X-Received: by 10.98.103.75 with SMTP id b72mr9936464pfc.105.1489009142735; Wed, 08 Mar 2017 13:39:02 -0800 (PST) Received: from skynet.sea.corp.google.com ([100.100.206.185]) by smtp.gmail.com with ESMTPSA id h3sm7945921pfc.82.2017.03.08.13.39.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Mar 2017 13:39:02 -0800 (PST) From: Thomas Garnier To: Arnd Bergmann , David Howells , Al Viro , Dave Hansen , Thomas Garnier , =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= , Andrew Morton , Kees Cook , "Paul E . McKenney" , Petr Mladek , Andy Lutomirski , Ard Biesheuvel , Nicolas Pitre , Sebastian Andrzej Siewior , Sergey Senozhatsky , Helge Deller , Rik van Riel , Ingo Molnar , John Stultz , Thomas Gleixner , Oleg Nesterov , Stanislav Kinsburskiy , Pavel Tikhomirov , Stephen Smalley , Frederic Weisbecker , Ingo Molnar , "H . Peter Anvin" , Paolo Bonzini , Dmitry Safonov , Borislav Petkov , Josh Poimboeuf , Brian Gerst , Alexander Potapenko , Jan Beulich , Russell King , Will Deacon , Catalin Marinas , Mark Rutland , James Morse , Chris Metcalf , Laura Abbott , Andre Przywara Subject: [PATCH v1 4/4] arm64/syscalls: Specific usage of verify_pre_usermode_state Date: Wed, 8 Mar 2017 13:38:44 -0800 Message-Id: <20170308213844.131877-4-thgarnie@google.com> X-Mailer: git-send-email 2.12.0.246.ga2ecc84866-goog In-Reply-To: <20170308213844.131877-1-thgarnie@google.com> References: <20170308213844.131877-1-thgarnie@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170308_133921_736402_BDF773E5 X-CRM114-Status: GOOD ( 11.54 ) 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-api@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-hardening@lists.openwall.com 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 arm64. --- Based on next-20170308 --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/entry.S | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 896eba61e5ed..da54774838d8 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -24,6 +24,7 @@ config ARM64 select ARCH_WANT_COMPAT_IPC_PARSE_VERSION select ARCH_WANT_FRAME_POINTERS select ARCH_HAS_UBSAN_SANITIZE_ALL + select ARCH_NO_SYSCALL_VERIFY_PRE_USERMODE_STATE select ARM_AMBA select ARM_ARCH_TIMER select ARM_GIC diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 43512d4d7df2..b3d1d9e5c7c1 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -744,6 +744,7 @@ ENDPROC(cpu_switch_to) ret_fast_syscall: disable_irq // disable interrupts str x0, [sp, #S_X0] // returned x0 + bl verify_pre_usermode_state ldr x1, [tsk, #TSK_TI_FLAGS] // re-check for syscall tracing and x2, x1, #_TIF_SYSCALL_WORK cbnz x2, ret_fast_syscall_trace @@ -771,6 +772,7 @@ work_pending: */ ret_to_user: disable_irq // disable interrupts + bl verify_pre_usermode_state ldr x1, [tsk, #TSK_TI_FLAGS] and x2, x1, #_TIF_WORK_MASK cbnz x2, work_pending