Skip to content

Commit f24a0a8

Browse files
author
CKI KWF Bot
committed
Merge: CVE-2024-56721: x86/CPU/AMD: Terminate the erratum_1386_microcode array
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1248 JIRA: https://issues.redhat.com/browse/RHEL-104883 CVE: CVE-2024-56721 ``` commit ff6cdc4 Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Tue Nov 26 14:47:22 2024 +0100 x86/CPU/AMD: Terminate the erratum_1386_microcode array 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: 29ba89f ("x86/CPU/AMD: Improve the erratum 1386 workaround") Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Cc: <stable@kernel.org> Link: https://lore.kernel.org/r/20241126134722.480975-1-bigeasy@linutronix.de ``` Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> --- <small>Created 2025-07-24 17:37 UTC by backporter - [KWF FAQ](https://red.ht/kernel_workflow_doc) - [Slack #team-kernel-workflow](https://redhat-internal.slack.com/archives/C04LRUPMJQ5) - [Source](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/webhook/utils/backporter.py) - [Documentation](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/docs/README.backporter.md) - [Report an issue](https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12334433&issuetype=1&priority=4&summary=backporter+webhook+issue&components=kernel-workflow+/+backporter)</small> Approved-by: Steve Best <sbest@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 7850f77 + 6d28679 commit f24a0a8

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86/kernel/cpu/amd.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,7 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
799799
static const struct x86_cpu_desc erratum_1386_microcode[] = {
800800
AMD_CPU_DESC(0x17, 0x1, 0x2, 0x0800126e),
801801
AMD_CPU_DESC(0x17, 0x31, 0x0, 0x08301052),
802+
{},
802803
};
803804

804805
static void fix_erratum_1386(struct cpuinfo_x86 *c)

0 commit comments

Comments
 (0)