From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756106AbbIUHsf (ORCPT ); Mon, 21 Sep 2015 03:48:35 -0400 Received: from mail.skyhub.de ([78.46.96.112]:33275 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755777AbbIUHsd (ORCPT ); Mon, 21 Sep 2015 03:48:33 -0400 Date: Mon, 21 Sep 2015 09:48:29 +0200 From: Borislav Petkov To: x86-ml Cc: linux-tip-commits@vger.kernel.org, tglx@linutronix.de, luto@amacapital.net, keescook@chromium.org, josh@joshtriplett.org, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, brgerst@gmail.com, torvalds@linux-foundation.org, dvlasenk@redhat.com Subject: Re: [tip:x86/asm] x86/entry/vsyscall: Add CONFIG to control default Message-ID: <20150921074829.GA3550@pd.tnic> References: <20150813005519.GA11696@www.outflux.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Sep 20, 2015 at 04:29:18AM -0700, tip-bot for Kees Cook wrote: > Commit-ID: 3dc33bd30f3e1c1bcaaafa3482737694debf0f0b > Gitweb: http://git.kernel.org/tip/3dc33bd30f3e1c1bcaaafa3482737694debf0f0b > Author: Kees Cook > AuthorDate: Wed, 12 Aug 2015 17:55:19 -0700 > Committer: Ingo Molnar > CommitDate: Sun, 20 Sep 2015 10:31:06 +0200 > > x86/entry/vsyscall: Add CONFIG to control default > > Most modern systems can run with vsyscall=none. In an effort to > provide a way for build-time defaults to lack legacy settings, > this adds a new CONFIG to select the type of vsyscall mapping to > use, similar to the existing "vsyscall" command line parameter. > > Signed-off-by: Kees Cook > Acked-by: Andy Lutomirski > Cc: Borislav Petkov > Cc: Brian Gerst > Cc: Denys Vlasenko > Cc: H. Peter Anvin > Cc: Josh Triplett > Cc: Linus Torvalds > Cc: Peter Zijlstra > Cc: Thomas Gleixner > Link: http://lkml.kernel.org/r/20150813005519.GA11696@www.outflux.net > Signed-off-by: Ingo Molnar > --- > arch/x86/Kconfig | 49 +++++++++++++++++++++++++++++++++++ > arch/x86/entry/vsyscall/vsyscall_64.c | 9 ++++++- > 2 files changed, 57 insertions(+), 1 deletion(-) ... > diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c > index b160c0c..76e0fd3 100644 > --- a/arch/x86/entry/vsyscall/vsyscall_64.c > +++ b/arch/x86/entry/vsyscall/vsyscall_64.c > @@ -38,7 +38,14 @@ > #define CREATE_TRACE_POINTS > #include "vsyscall_trace.h" > > -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE; > +static enum { EMULATE, NATIVE, NONE } vsyscall_mode = > +#ifdef CONFIG_LEGACY_VSYSCALL_NATIVE > + NATIVE; > +#elif CONFIG_LEGACY_VSYSCALL_NONE My gcc complains about this. If it hasn't been fixed yet, here's a fix: --- From: Borislav Petkov Date: Mon, 21 Sep 2015 09:34:23 +0200 Subject: [PATCH] x86/entry/vsyscall: Fix undefined symbol warning 3dc33bd30f3e1 ("x86/entry/vsyscall: Add CONFIG to control default") did the ifdef/elif thing but gcc doesn't like that: arch/x86/entry/vsyscall/vsyscall_64.c:44:7: warning: "CONFIG_LEGACY_VSYSCALL_NONE" is not defined [-Wundef] #elif CONFIG_LEGACY_VSYSCALL_NONE ^ Use defined() instead. Cc: Andy Lutomirski Cc: Kees Cook Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Triplett Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20150813005519.GA11696@www.outflux.net Signed-off-by: Borislav Petkov --- arch/x86/entry/vsyscall/vsyscall_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 76e0fd3ea1fb..174c2549939d 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -39,9 +39,9 @@ #include "vsyscall_trace.h" static enum { EMULATE, NATIVE, NONE } vsyscall_mode = -#ifdef CONFIG_LEGACY_VSYSCALL_NATIVE +#if defined(CONFIG_LEGACY_VSYSCALL_NATIVE) NATIVE; -#elif CONFIG_LEGACY_VSYSCALL_NONE +#elif defined(CONFIG_LEGACY_VSYSCALL_NONE) NONE; #else EMULATE; -- 2.1.4 -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply.