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: 9612031 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 948BE60414 for ; Wed, 8 Mar 2017 21:40:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 838F62862E for ; Wed, 8 Mar 2017 21:40:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 733FD2863D; Wed, 8 Mar 2017 21:40:43 +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 E75BA2862E for ; Wed, 8 Mar 2017 21:40:42 +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=yv4hIuTu5pKlGgJiuntM8jqGKLDz0LK7S5vPvEDYGeo=; b=dv9748DsSQ71yo2/LxbFVDMLdJ WW/IOnZ0j37j3larDgq5WXB+GzpcNKhcfh/O+rEAVSuq/mlNGTGjpXMoZro89hAqk1F4e/FGZKI1g T2MZD1bmaGjXH5GSvaF3Se8EbPdIJmDi/zuvRs+eQNxg45pen800DLO/l9Y1g0VosXnhmFPPi5Qcs M+CMfO2v/SigIZtSjqLiQ7MoUUfRdSc9ZvszKvVOWwE+fkepzIu17esGzl2LbQQbiFVGUEDIMcUnk fN/U86G6MO867wyLWzZ1lzXvBOevqd+POCVzshlHHGAOjEAbPSZ4ykaws4+PEzpsYnjfY/ipjsWlf 9G8X2xeQ==; 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 1cljK6-0002KV-N9; Wed, 08 Mar 2017 21:40:42 +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-0000bn-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 b129so17724455pgc.2 for ; Wed, 08 Mar 2017 13:39:01 -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=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=mh0wLHHPv7YkpY9I3nto9e9Fz3iOradoupZ38MGz08F0IcvwrrBuen7go4RALusuIy hRdno6DWmHYPvn4pUs5mQLjOYUGA6kg3sQnjV2uC+m5QKHy34RXKnvtMkW+S/6MPfMye oK9RGUn3r7CLyfu82HSBdotNXflTudaPQ0rxrfyb6oinUy61ORPOhTvMG1nSx6vt4brH L2f0SvNUGk5V3kLhPZjKbxQw14dT+kDF9nmGdpdYU7Y+dLYduq93+pPznHKqvvt5sUM6 ueBa4ggrI6Slrlg6Hc5bY1zPan2R+NWcXop5SL1d1/zHt2Lr09Igt75ZGBQJIZwgeQWD bOaA== X-Gm-Message-State: AMke39lJLJUS0+fkxSWkRmK5FfD5xf5lMUoVia4tkKkZTOQ8BSMYbOR1ZoHTyXem7axxZ4J9 X-Received: by 10.99.5.82 with SMTP id 79mr9689027pgf.8.1489009140521; Wed, 08 Mar 2017 13:39:00 -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.38.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Mar 2017 13:38:59 -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 2/4] x86/syscalls: Specific usage of verify_pre_usermode_state 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170308_133921_737001_0C1634F7 X-CRM114-Status: GOOD ( 14.49 ) 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 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