Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e383095c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/cpu/bugs: Make retpoline module warning conditional 



If sysfs is disabled and RETPOLINE not defined:

arch/x86/kernel/cpu/bugs.c:97:13: warning: ‘spectre_v2_bad_module’ defined but not used
[-Wunused-variable]
 static bool spectre_v2_bad_module;

Hide it.

Fixes: caf7501a ("module/retpoline: Warn about missing retpoline in module")
Reported-by: default avatarBorislav Petkov <bp@alien8.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
parent 55fa19d3

arch/x86/kernel/cpu/bugs.c

+11 −3
Original line number Diff line number Diff line
@@ -94,9 +94,10 @@ static const char *spectre_v2_strings[] = { 
#define pr_fmt(fmt)     "Spectre V2 : " fmt



static enum spectre_v2_mitigation spectre_v2_enabled = SPECTRE_V2_NONE;

static bool spectre_v2_bad_module;



#ifdef RETPOLINE

static bool spectre_v2_bad_module;



bool retpoline_module_ok(bool has_retpoline)

{

	if (spectre_v2_enabled == SPECTRE_V2_NONE || has_retpoline)
@@ -106,6 +107,13 @@ bool retpoline_module_ok(bool has_retpoline) 
	spectre_v2_bad_module = true;

	return false;

}



static inline const char *spectre_v2_module_string(void)

{

	return spectre_v2_bad_module ? " - vulnerable module loaded" : "";

}

#else

static inline const char *spectre_v2_module_string(void) { return ""; }

#endif



static void __init spec2_print_if_insecure(const char *reason)
@@ -300,7 +308,7 @@ ssize_t cpu_show_spectre_v2(struct device *dev, 
		return sprintf(buf, "Not affected\n");



	return sprintf(buf, "%s%s%s\n", spectre_v2_strings[spectre_v2_enabled],

		       boot_cpu_has(X86_FEATURE_IBPB) ? ", IPBP" : "",

		       spectre_v2_bad_module ? " - vulnerable module loaded" : "");

		       boot_cpu_has(X86_FEATURE_IBPB) ? ", IBPB" : "",

		       spectre_v2_module_string());

}

#endif