[SRU Mantic][PATCH 1/9] x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file

[Juerg Haefliger]

On Mon, 15 Apr 2024 11:48:12 +0200
Stefan Bader <stefan.bader at canonical.com> wrote:

> From: Josh Poimboeuf <jpoimboe at kernel.org>
> 
> commit 0cd01ac5dcb1e18eb18df0f0d05b5de76522a437 upstream.
> 
> Change the format of the 'spectre_v2' vulnerabilities sysfs file
> slightly by converting the commas to semicolons, so that mitigations for
> future variants can be grouped together and separated by commas.

Same comment here: User visible change might break existing tools.

...Juerg


> Signed-off-by: Josh Poimboeuf <jpoimboe at kernel.org>
> Signed-off-by: Daniel Sneddon <daniel.sneddon at linux.intel.com>
> Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
> Signed-off-by: Daniel Sneddon <daniel.sneddon at linux.intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> 
> CVE-2024-2201
> (cherry picked from commit 108feca9e47df1bed26ac7b04306587d9ebccda3 linux-6.6.y)
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  arch/x86/kernel/cpu/bugs.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
> index a55a3864df1c..50ba287497e9 100644
> --- a/arch/x86/kernel/cpu/bugs.c
> +++ b/arch/x86/kernel/cpu/bugs.c
> @@ -2626,15 +2626,15 @@ static char *stibp_state(void)
>  
>  	switch (spectre_v2_user_stibp) {
>  	case SPECTRE_V2_USER_NONE:
> -		return ", STIBP: disabled";
> +		return "; STIBP: disabled";
>  	case SPECTRE_V2_USER_STRICT:
> -		return ", STIBP: forced";
> +		return "; STIBP: forced";
>  	case SPECTRE_V2_USER_STRICT_PREFERRED:
> -		return ", STIBP: always-on";
> +		return "; STIBP: always-on";
>  	case SPECTRE_V2_USER_PRCTL:
>  	case SPECTRE_V2_USER_SECCOMP:
>  		if (static_key_enabled(&switch_to_cond_stibp))
> -			return ", STIBP: conditional";
> +			return "; STIBP: conditional";
>  	}
>  	return "";
>  }
> @@ -2643,10 +2643,10 @@ static char *ibpb_state(void)
>  {
>  	if (boot_cpu_has(X86_FEATURE_IBPB)) {
>  		if (static_key_enabled(&switch_mm_always_ibpb))
> -			return ", IBPB: always-on";
> +			return "; IBPB: always-on";
>  		if (static_key_enabled(&switch_mm_cond_ibpb))
> -			return ", IBPB: conditional";
> -		return ", IBPB: disabled";
> +			return "; IBPB: conditional";
> +		return "; IBPB: disabled";
>  	}
>  	return "";
>  }
> @@ -2656,11 +2656,11 @@ static char *pbrsb_eibrs_state(void)
>  	if (boot_cpu_has_bug(X86_BUG_EIBRS_PBRSB)) {
>  		if (boot_cpu_has(X86_FEATURE_RSB_VMEXIT_LITE) ||
>  		    boot_cpu_has(X86_FEATURE_RSB_VMEXIT))
> -			return ", PBRSB-eIBRS: SW sequence";
> +			return "; PBRSB-eIBRS: SW sequence";
>  		else
> -			return ", PBRSB-eIBRS: Vulnerable";
> +			return "; PBRSB-eIBRS: Vulnerable";
>  	} else {
> -		return ", PBRSB-eIBRS: Not affected";
> +		return "; PBRSB-eIBRS: Not affected";
>  	}
>  }
>  
> @@ -2679,9 +2679,9 @@ static ssize_t spectre_v2_show_state(char *buf)
>  	return sysfs_emit(buf, "%s%s%s%s%s%s%s\n",
>  			  spectre_v2_strings[spectre_v2_enabled],
>  			  ibpb_state(),
> -			  boot_cpu_has(X86_FEATURE_USE_IBRS_FW) ? ", IBRS_FW" : "",
> +			  boot_cpu_has(X86_FEATURE_USE_IBRS_FW) ? "; IBRS_FW" : "",
>  			  stibp_state(),
> -			  boot_cpu_has(X86_FEATURE_RSB_CTXSW) ? ", RSB filling" : "",
> +			  boot_cpu_has(X86_FEATURE_RSB_CTXSW) ? "; RSB filling" : "",
>  			  pbrsb_eibrs_state(),
>  			  spectre_v2_module_string());
>  }

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20240430/1fff5049/attachment.sig>