]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
x86/spectre: Check CONFIG_RETPOLINE in command line parser
authorDou Liyang <douly.fnst@cn.fujitsu.com>
Tue, 30 Jan 2018 06:13:50 +0000 (14:13 +0800)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 30 Jan 2018 14:30:35 +0000 (15:30 +0100)
The spectre_v2 option 'auto' does not check whether CONFIG_RETPOLINE is
enabled. As a consequence it fails to emit the appropriate warning and sets
feature flags which have no effect at all.

Add the missing IS_ENABLED() check.

Fixes: da285121560e ("x86/spectre: Add boot time option to select Spectre v2 mitigation")
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: ak@linux.intel.com
Cc: peterz@infradead.org
Cc: Tomohiro" <misono.tomohiro@jp.fujitsu.com>
Cc: dave.hansen@intel.com
Cc: bp@alien8.de
Cc: arjan@linux.intel.com
Cc: dwmw@amazon.co.uk
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/f5892721-7528-3647-08fb-f8d10e65ad87@cn.fujitsu.com
arch/x86/kernel/cpu/bugs.c

index 3bfb2b23d79c5a80113d8c2d89b09dc187de6da2..400c34ec9179af7e1c6b5fbd8581e9b430028096 100644 (file)
@@ -213,10 +213,10 @@ static void __init spectre_v2_select_mitigation(void)
                return;
 
        case SPECTRE_V2_CMD_FORCE:
-               /* FALLTRHU */
        case SPECTRE_V2_CMD_AUTO:
-               goto retpoline_auto;
-
+               if (IS_ENABLED(CONFIG_RETPOLINE))
+                       goto retpoline_auto;
+               break;
        case SPECTRE_V2_CMD_RETPOLINE_AMD:
                if (IS_ENABLED(CONFIG_RETPOLINE))
                        goto retpoline_amd;