From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224Ia+2Oddq7MsV2JEhS+AVbX5MzeqP1eyh1+qME1e0KwCPFqi9BBIuxGd3HGuG4kmM+LAx6 ARC-Seal: i=1; a=rsa-sha256; t=1516610888; cv=none; d=google.com; s=arc-20160816; b=r0pmcBM7Ylb1J4bVIQ9kZdxqn6TV6FGRq7BDlYPqZGC1GTvVwMlHJLuU5I4pm9b6qS 4JQ3rU2xpNflwlv3L6T9OpnuYCzcouQW0pKWiiz2rmKNIdPVmicmJUb1ZsbR7Djt6CJt DFMtu8OHU925CrI32LX3MG/dZtbGkb6twMDTfyiYb6nMW1VfH/mlyiTU4qXO4qFE9Ajv a3Roow56ozxykWgTpZd5eRuITNtg2VusZjvh1/V8gyTZtg8FoWbvGcRO3stViMNfwuSX /gWmeKui3G8ddULSNRpROxxy4cvLCnYEUK07C18REsJY4GdQ/FMJll0KFQ13LsN3ReP9 Nt8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=3gX6ekfHapr8W9QFubo5BW0FPxL+ijQcAUdVfxw0wZc=; b=iIiHwqcMqhf5QXrChiUcKod79VmpSZGau/qLXXHNvJyNcNMMcP8g4T8WefcitzaZ6i enmHkTkPgoTBvnlCF5TqPcPFi/n+yioFMkyGYHy5aYaN+BHRNiAoxtJENmn+JQiSONNL weoNZAfPew4fhqeeOtgByJ+IxCA/j/OhB84EBTAHnCzc4egOHozY62okpyhtKLEDBh6O 5X+2v4c2mYcW1hEnMpbQlWUBCZeiKgfTvbQO//13bXZiuY7CyfrYrYRgK7QPWxV/EnhX UyeB1yYNHg7rniWdU2mfG8zMEQfEK9Qd887wWmZFiaX+5i++rNeSwDbEK0m3lalh3q8i LJVg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andi Kleen , Thomas Gleixner , David Woodhouse , rusty@rustcorp.com.au, arjan.van.de.ven@intel.com, jeyu@kernel.org, torvalds@linux-foundation.org Subject: [PATCH 4.9 18/47] module: Add retpoline tag to VERMAGIC Date: Mon, 22 Jan 2018 09:45:29 +0100 Message-Id: <20180122083927.043940276@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083925.568134913@linuxfoundation.org> References: <20180122083925.568134913@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590281438860319710?= X-GMAIL-MSGID: =?utf-8?q?1590281778953181973?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andi Kleen commit 6cfb521ac0d5b97470883ff9b7facae264b7ab12 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- include/linux/vermagic.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/include/linux/vermagic.h +++ b/include/linux/vermagic.h @@ -24,10 +24,16 @@ #ifndef MODULE_ARCH_VERMAGIC #define MODULE_ARCH_VERMAGIC "" #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_ARCH_VERMAGIC \ + MODULE_VERMAGIC_RETPOLINE