x86/retpoline: check CONFIG_RETPOLINE option when SPECTRE_V2_CMD_AUTO
Subsystems (2)
PATCH 1/1 x86/retpoline: check CONFIG_RETPOLINE option when SPECTRE_V2_CMD_AUTO
Currently, if there is no spectre_v2= or nospectre_v2 specified in the boot parameter, the kernel will automatically choose mitigation by default. However, when selecting the auto mode, it doesn't check whether the retpoline has been built in the kernel. Thus, if someone built a kernel without CONFIG_RETPOLINE and booted the system without specifying any spectre_v2 kernel parameters, the kernel would still report that it has enabled a minimal retpoline mitigation which is not the case. This patch adds the checking of CONFIG_RETPOLINE option under the 'auto' mode to fix it.
--- arch/x86/kernel/cpu/bugs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/bugs.c +3 -1
@@ -193,7 +193,9 @@ static void __init spectre_v2_select_mitigation(void)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 ))
Signature · 1 line
2.13.5 (Apple Git-94)
Quoted 9 lines · Chen Baozi
Currently, if there is no spectre_v2= or
nospectre_v2specified in the boot parameter, the kernel will automatically choose mitigation by default. However, when selecting the auto mode, it doesn't check whether the retpoline has been built in the kernel. Thus, if someone built a kernel withoutCONFIG_RETPOLINEand booted the system without specifying anyspectre_v2kernel parameters, the kernel would still report that it has enabled a minimal retpoline mitigation which is not the case. This patch adds the checking ofCONFIG_RETPOLINEoption under the 'auto' mode to fix it.
Thanks for sending that patch, but its already fixed and queued for upstream:
Thanks,
tglx