Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752588AbeAQKm6 (ORCPT + 1 other); Wed, 17 Jan 2018 05:42:58 -0500 Received: from terminus.zytor.com ([65.50.211.136]:35253 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750853AbeAQKm4 (ORCPT ); Wed, 17 Jan 2018 05:42:56 -0500 Date: Wed, 17 Jan 2018 02:40:43 -0800 From: tip-bot for Andi Kleen Message-ID: Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, ak@linux.intel.com, dwmw@amazon.co.uk, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, dwmw@amazon.co.uk, ak@linux.intel.com In-Reply-To: <20180116205228.4890-1-andi@firstfloor.org> References: <20180116205228.4890-1-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] module: Add retpoline tag to VERMAGIC Git-Commit-ID: 6cfb521ac0d5b97470883ff9b7facae264b7ab12 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 Return-Path: Commit-ID: 6cfb521ac0d5b97470883ff9b7facae264b7ab12 Gitweb: https://git.kernel.org/tip/6cfb521ac0d5b97470883ff9b7facae264b7ab12 Author: Andi Kleen AuthorDate: Tue, 16 Jan 2018 12:52:28 -0800 Committer: Thomas Gleixner CommitDate: Wed, 17 Jan 2018 11:35:14 +0100 module: Add retpoline tag to VERMAGIC Add a marker for retpoline to the module VERMAGIC. This catches the case when a non RETPOLINE compiled module gets loaded into a retpoline kernel, making it insecure. It doesn't handle the case when retpoline has been runtime disabled. Even in this case the match of the retcompile status will be enforced. This implies that even with retpoline run time disabled all modules loaded need to be recompiled. Signed-off-by: Andi Kleen Signed-off-by: Thomas Gleixner Reviewed-by: Greg Kroah-Hartman Acked-by: David Woodhouse Cc: rusty@rustcorp.com.au Cc: arjan.van.de.ven@intel.com Cc: jeyu@kernel.org Cc: torvalds@linux-foundation.org Link: https://lkml.kernel.org/r/20180116205228.4890-1-andi@firstfloor.org --- include/linux/vermagic.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h index bae807e..8532917 100644 --- a/include/linux/vermagic.h +++ b/include/linux/vermagic.h @@ -31,11 +31,17 @@ #else #define MODULE_RANDSTRUCT_PLUGIN #endif +#ifdef RETPOLINE +#define MODULE_VERMAGIC_RETPOLINE "retpoline " +#else +#define MODULE_VERMAGIC_RETPOLINE "" +#endif #define VERMAGIC_STRING \ UTS_RELEASE " " \ MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \ MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \ MODULE_ARCH_VERMAGIC \ - MODULE_RANDSTRUCT_PLUGIN + MODULE_RANDSTRUCT_PLUGIN \ + MODULE_VERMAGIC_RETPOLINE