From patchwork Wed Mar 8 21:38:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9612023 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 2DDC560414 for ; Wed, 8 Mar 2017 21:39:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FC462862A for ; Wed, 8 Mar 2017 21:39:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1405E28635; Wed, 8 Mar 2017 21:39:33 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id 3CBB42862A for ; Wed, 8 Mar 2017 21:39:31 +0000 (UTC) Received: (qmail 15517 invoked by uid 550); 8 Mar 2017 21:39:15 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 15413 invoked from network); 8 Mar 2017 21:39:12 -0000 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=kHMd0xTlWwGOsai3WUfqAnFDhD5mRntO1hGMTlvxk5k=; b=UE4HC6rlxIzr/ZxJfLWyt8vIiNxf6cSmneMONdS66nAdQ7PynEHHMnbRoqyffWfh1R G0q8RlxD56HFu3BH5hvuPvidK7ETHsgfjUDATcktCpwLD6ukLVKwYsi+RcIkloC02rBA aUk5tsvWtUxqJ4uwS7jahppaipmQbn8H3QGltz3nr/KqAiPTkgMDKvAjC0sAeMsVQlqE m/UUBcWFSSp2rPHR6lttvK6FSv2oakmv7GZaK2gSkPhOsznB+HlLCSCc+OzOXVAwgI4y iAvX32OleB6B7LdUJiPHSTrNqRXBsDfhBnVUZ84+s28YegaxaayWwJkW4wUPdzUVPmlK w0uA== 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=kHMd0xTlWwGOsai3WUfqAnFDhD5mRntO1hGMTlvxk5k=; b=BrVi1ZAcTt+9ALoGTx+wmNo90tTeqnqeh+WI+2ZaNyAYOqYbazWorX+MtcHqUm8V41 oqBXujNRfkMMLnqiQGT+uivcMpDpDE5ldZ6TJZnX1R8dbUGrchFOM3L05qQPXpQFdmA1 dIkC22pAl0TxVcAmsHPMNAqXEZTiyNgxEuD+1xHjN/stI70+owuAlCn3UwYJi/rtl0kv F0Z7LgKQ9lRV0KVGPjxDvs/Wsm1G2SyK+w7qCYpZPgQmNWhGVJhKJX7Pmaq0tKF3zjZz WP8FQnq78cCYpfkZnQlmU56+24Fo0j0gwERajxA2vEAJomciLVaKZ3fVmFfwIBuORuOI 68gA== X-Gm-Message-State: AMke39lYY7QbsdgUWijEtjIqLi41O+mbbzdDiOFEma2nVDYOuFlosyfr5moZDejHGxMReTnc X-Received: by 10.99.5.82 with SMTP id 79mr9689027pgf.8.1489009140521; Wed, 08 Mar 2017 13:39:00 -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 Cc: linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-arm-kernel@lists.infradead.org, kernel-hardening@lists.openwall.com Date: Wed, 8 Mar 2017 13:38:42 -0800 Message-Id: <20170308213844.131877-2-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> Subject: [kernel-hardening] [PATCH v1 2/4] x86/syscalls: Specific usage of verify_pre_usermode_state X-Virus-Scanned: ClamAV using ClamSMTP Implement specific usage of verify_pre_usermode_state for user-mode returns for x86. --- Based on next-20170308 --- arch/x86/Kconfig | 1 + arch/x86/entry/common.c | 3 +++ arch/x86/entry/entry_64.S | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 005df7c825f5..6d48e18e6f09 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -63,6 +63,7 @@ config X86 select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_NO_SYSCALL_VERIFY_PRE_USERMODE_STATE select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT select ARCH_SUPPORTS_NUMA_BALANCING if X86_64 diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 370c42c7f046..525edbb77f03 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -180,6 +181,8 @@ __visible inline void prepare_exit_to_usermode(struct pt_regs *regs) struct thread_info *ti = current_thread_info(); u32 cached_flags; + verify_pre_usermode_state(); + if (IS_ENABLED(CONFIG_PROVE_LOCKING) && WARN_ON(!irqs_disabled())) local_irq_disable(); diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index d2b2a2948ffe..795c31eebd09 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -201,6 +201,7 @@ entry_SYSCALL_64_fastpath: * It might end up jumping to the slow path. If it jumps, RAX * and all argument registers are clobbered. */ + call *sys_call_table(, %rax, 8) .Lentry_SYSCALL_64_after_fastpath_call: @@ -218,6 +219,11 @@ entry_SYSCALL_64_fastpath: testl $_TIF_ALLWORK_MASK, TASK_TI_flags(%r11) jnz 1f + /* + * Check user-mode state on fast path return, the same check is done + * under the slow path through syscall_return_slowpath. + */ + call verify_pre_usermode_state LOCKDEP_SYS_EXIT TRACE_IRQS_ON /* user mode is traced as IRQs on */ movq RIP(%rsp), %rcx