From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751735AbeDYJJm (ORCPT ); Wed, 25 Apr 2018 05:09:42 -0400 Received: from terminus.zytor.com ([198.137.202.136]:41161 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751274AbeDYJJf (ORCPT ); Wed, 25 Apr 2018 05:09:35 -0400 Date: Wed, 25 Apr 2018 02:08:37 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: jgross@suse.com, mingo@kernel.org, arjan@linux.intel.com, peterz@infradead.org, keescook@google.com, namit@vmware.com, aarcange@redhat.com, gregkh@linuxfoundation.org, tglx@linutronix.de, jpoimboe@redhat.com, luto@kernel.org, hughd@google.com, bp@alien8.de, vbabka@suse.cz, dave.hansen@linux.intel.com, dwmw2@infradead.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, dan.j.williams@intel.com Reply-To: tglx@linutronix.de, jpoimboe@redhat.com, luto@kernel.org, dwmw2@infradead.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, dan.j.williams@intel.com, hughd@google.com, bp@alien8.de, dave.hansen@linux.intel.com, vbabka@suse.cz, keescook@google.com, namit@vmware.com, jgross@suse.com, mingo@kernel.org, arjan@linux.intel.com, peterz@infradead.org, gregkh@linuxfoundation.org, aarcange@redhat.com In-Reply-To: <20180420222026.D0B4AAC9@viggo.jf.intel.com> References: <20180420222026.D0B4AAC9@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/pti: Disallow global kernel text with RANDSTRUCT Git-Commit-ID: b7c21bc56fbedf4a61b628c6b11e0d7048746cc1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b7c21bc56fbedf4a61b628c6b11e0d7048746cc1 Gitweb: https://git.kernel.org/tip/b7c21bc56fbedf4a61b628c6b11e0d7048746cc1 Author: Dave Hansen AuthorDate: Fri, 20 Apr 2018 15:20:26 -0700 Committer: Thomas Gleixner CommitDate: Wed, 25 Apr 2018 11:02:51 +0200 x86/pti: Disallow global kernel text with RANDSTRUCT commit 26d35ca6c3776784f8156e1d6f80cc60d9a2a915 RANDSTRUCT derives its hardening benefits from the attacker's lack of knowledge about the layout of kernel data structures. Keep the kernel image non-global in cases where RANDSTRUCT is in use to help keep the layout a secret. Fixes: 8c06c7740 (x86/pti: Leave kernel text global for !PCID) Reported-by: Kees Cook Signed-off-by: Dave Hansen Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Andrea Arcangeli Cc: Juergen Gross Cc: Josh Poimboeuf Cc: Greg Kroah-Hartman Cc: Peter Zijlstra Cc: David Woodhouse Cc: Hugh Dickins Cc: linux-mm@kvack.org Cc: Linus Torvalds Cc: Borislav Petkov Cc: Andy Lutomirski Cc: Nadav Amit Cc: Dan Williams Cc: Arjan van de Ven Cc: Vlastimil Babka Link: https://lkml.kernel.org/r/20180420222026.D0B4AAC9@viggo.jf.intel.com --- arch/x86/mm/pti.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index ae3eb4f5d53b..4d418e705878 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -421,6 +421,16 @@ static inline bool pti_kernel_image_global_ok(void) if (boot_cpu_has(X86_FEATURE_K8)) return false; + /* + * RANDSTRUCT derives its hardening benefits from the + * attacker's lack of knowledge about the layout of kernel + * data structures. Keep the kernel image non-global in + * cases where RANDSTRUCT is in use to help keep the layout a + * secret. + */ + if (IS_ENABLED(CONFIG_GCC_PLUGIN_RANDSTRUCT)) + return false; + return true; }