From 0a1ad45b32a72cb7bcf6eed78ee2007e8b44bf9d Mon Sep 17 00:00:00 2001 From: Yifan Liu Date: Wed, 1 Sep 2021 14:12:12 +0800 Subject: [PATCH] hv: Avoid using SMBIOS major version Previously it is (falsely) assumed that the major_ver of 32-bit SMBIOS entry point structure (which is called SMBIOS 2.1 in spec, or SMBIOS2 in code) will have a value of 2 and major_ver of 64-bit SMBIOS (which is called SMBIOS 3.0 in spec, and SMBIOS3 in code) will have a value of 3. This turned out to be wrong. This major_ver refers to the implemented doc revision, and 32-bit SMBIOS2 can have its major_ver to be 3 (current most recent implementation). This patch removes the use of major_ver to distinguish between SMBIOS2/3, and use a doc-defined anchor string instead. Tracked-On: #6528 Signed-off-by: Yifan Liu --- hypervisor/quirks/security_vm_fixup.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hypervisor/quirks/security_vm_fixup.c b/hypervisor/quirks/security_vm_fixup.c index d472f713b..f6b26bdf5 100644 --- a/hypervisor/quirks/security_vm_fixup.c +++ b/hypervisor/quirks/security_vm_fixup.c @@ -119,7 +119,6 @@ struct smbios_info { struct smbios2_entry_point eps2; struct smbios3_entry_point eps3; } smbios_eps; - uint8_t major_ver; size_t smbios_eps_size; void *smbios_table; size_t smbios_table_size; @@ -150,7 +149,6 @@ static inline void get_smbios3_info(struct smbios3_entry_point *eps3, struct smb memcpy_s(&si->smbios_eps, si->smbios_eps_size, eps3, si->smbios_eps_size); si->smbios_table = hpa2hva(eps3->st_addr); si->smbios_table_size = eps3->max_st_size; - si->major_ver = eps3->major_ver; } static inline void get_smbios2_info(struct smbios2_entry_point *eps2, struct smbios_info *si) @@ -159,7 +157,6 @@ static inline void get_smbios2_info(struct smbios2_entry_point *eps2, struct smb memcpy_s(&si->smbios_eps, si->smbios_eps_size, eps2, si->smbios_eps_size); si->smbios_table = hpa2hva(eps2->st_addr); si->smbios_table_size = eps2->st_length; - si->major_ver = eps2->major_ver; } static void generate_checksum(uint8_t *byte_start, int nbytes, uint8_t *checksum_pos) @@ -198,7 +195,7 @@ static int copy_smbios_to_guest(struct acrn_vm *vm, struct smbios_info *si) gpa = VIRT_SMBIOS_TABLE_ADDR; ret = copy_to_gpa(vm, si->smbios_table, gpa, si->smbios_table_size); if (ret == 0) { - if (si->major_ver == 2) { + if (strncmp("_SM_", si->smbios_eps.eps2.anchor, 4) == 0) { struct smbios2_entry_point *eps2 = &si->smbios_eps.eps2; eps2->st_addr = (uint32_t)gpa; /* If we wrote generate_checksum(eps->int_anchor, ...), the code scanning tool will @@ -207,7 +204,7 @@ static int copy_smbios_to_guest(struct acrn_vm *vm, struct smbios_info *si) generate_checksum((uint8_t *)eps2 + offsetof(struct smbios2_entry_point, int_anchor), 0xf, &eps2->int_checksum); generate_checksum((uint8_t *)eps2, eps2->length, &eps2->checksum); - } else if (si->major_ver == 3) { + } else if (strncmp("_SM3_", si->smbios_eps.eps3.anchor, 5) == 0) { struct smbios3_entry_point *eps3 = &si->smbios_eps.eps3; eps3->st_addr = (uint32_t)gpa; generate_checksum((uint8_t *)eps3, eps3->length, &eps3->checksum);