NACK: [SRU][J][PATCH 1/1] x86/CPU/AMD: Terminate the erratum_1386_microcode array

Massimiliano Pellizzer massimiliano.pellizzer at canonical.com
Tue Mar 25 10:01:30 UTC 2025


On Mon, 24 Mar 2025 at 15:29, Kevin Becker <kevin.becker at canonical.com> wrote:
>
> From: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
>
> The erratum_1386_microcode array requires an empty entry at the end.
> Otherwise x86_match_cpu_with_stepping() will continue iterate the array after
> it ended.
>
> Add an empty entry to erratum_1386_microcode to its end.
>
> Fixes: 29ba89f189528 ("x86/CPU/AMD: Improve the erratum 1386 workaround")
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
> Signed-off-by: Borislav Petkov (AMD) <bp at alien8.de>
> Cc: <stable at kernel.org>
> Link: https://lore.kernel.org/r/20241126134722.480975-1-bigeasy@linutronix.de
> (backported from commit ff6cdc407f4179748f4673c39b0921503199a0ad 6.13)

The commit ff6cdc407f4179 comes from mainline, therefore there is no need
to specify anything after the commit hash.
In case of a backport/cherry-pick from stable branches please use linux-x.x.y,
after the commit hash.
Please send a v2 fixing this minor error.
Thanks.

-- 
Massimiliano Pellizzer

> [kevinbecker: fixed context conflict due to the backport of the break
>  commit (4a3beb84ba8e63042030c13803bb8804d0123675), since Jammy is
>  missing 'fix_erratum_1386' definition]
> CVE-2024-56721
> Signed-off-by: Kevin Becker <kevin.becker at canonical.com>
> ---
>  arch/x86/kernel/cpu/amd.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index d7e96ed427ef..4062cf3cdaeb 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -935,6 +935,7 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
>  static const struct x86_cpu_desc erratum_1386_microcode[] = {
>         AMD_CPU_DESC(0x17,  0x1, 0x2, 0x0800126e),
>         AMD_CPU_DESC(0x17, 0x31, 0x0, 0x08301052),
> +       {},
>  };
>
>  void init_spectral_chicken(struct cpuinfo_x86 *c)
> --
> 2.43.0
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team



More information about the kernel-team mailing list