x86/ucode: Cross check the minimum revision

For Zen3-5 microcode blobs signed with the updated signature scheme, the
checksum field has been reused to be a min_revision field, referring to the
microcode revision which fixed Entrysign (SB-7033, CVE-2024-36347).

Cross-check this when trying to load microcode, but allow --force to override
it.  If the signature scheme is genuinely different, a #GP will occur.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Release-Acked-By: Oleksii Kurochko <oleksii.kurochko@gmail.com>
(cherry picked from commit b3f015b8ba)
[Note: --force doesn't exist in this version of Xen]
This commit is contained in:
Andrew Cooper committed 2025-10-28 18:17:45 +00:00
1 parent 4f5b3cde23
commit aabe803e8e
1 file changed
+48 -1
+48 -1
View File
@@ -42,7 +42,10 @@ struct microcode_patch {
uint8_t mc_patch_data_id[2];
uint8_t mc_patch_data_len;
uint8_t init_flag;
uint32_t mc_patch_data_checksum;
union {
uint32_t checksum; /* Fam12h and earlier */
uint32_t min_rev; /* Zen3-5, post Entrysign */
};
uint32_t nb_dev_id;
uint32_t sb_dev_id;
uint16_t processor_rev_id;
@@ -267,6 +270,42 @@ static enum microcode_match_result compare_header(
return compare_revisions(old->patch_id, new->patch_id);
}
/*
* Check whether this patch has a minimum revision given, and whether the
* condition is satisfied.
*
* In linux-firmware for CPUs suffering from the Entrysign vulnerability,
* ucodes signed with the updated signature algorithm have reused the checksum
* field as a min-revision field. From public archives, the checksum field
* appears to have been unused since Fam12h.
*
* Returns false if there is a min revision given, and it suggests that that
* the patch cannot be loaded on the current system. True otherwise.
*/
static bool check_min_rev(const struct microcode_patch *patch)
{
ASSERT(microcode_fits(patch));
if ( patch->processor_rev_id < 0xa000 || /* pre Zen3? */
patch->min_rev == 0 ) /* No min rev specified */
return true;
/*
* Sanity check, as this is a reused field. If this is a true
* min_revision field, it will differ only in the bottom byte from the
* patch_id. Otherwise, it's probably a checksum.
*/
if ( (patch->patch_id ^ patch->min_rev) & ~0xff )
{
printk(XENLOG_WARNING
"microcode: patch %#x has unexpected min_rev %#x\n",
patch->patch_id, patch->min_rev);
return true;
}
return this_cpu(cpu_sig).rev >= patch->min_rev;
}
static enum microcode_match_result cf_check compare_patch(
const struct microcode_patch *new, const struct microcode_patch *old)
{
@@ -303,6 +342,14 @@ static int cf_check apply_microcode(const struct microcode_patch *patch)
return -ENXIO;
}
if ( !check_min_rev(patch) )
{
printk(XENLOG_ERR
"microcode: CPU%u current rev %#x below patch min_rev %#x\n",
cpu, sig->rev, patch->min_rev);
return -ENXIO;
}
hw_err = wrmsr_safe(MSR_AMD_PATCHLOADER, (unsigned long)patch);
/* get patch id after patching */
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.