[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/53] hw/smbios: fix field corruption in type 4 table
From: |
Michael S. Tsirkin |
Subject: |
[PULL 01/53] hw/smbios: fix field corruption in type 4 table |
Date: |
Thu, 2 Mar 2023 03:24:28 -0500 |
From: Julia Suvorova <jusual@redhat.com>
Since table type 4 of SMBIOS version 2.6 is shorter than 3.0, the
strings which follow immediately after the struct fields have been
overwritten by unconditional filling of later fields such as core_count2.
Make these fields dependent on the SMBIOS version.
Fixes: 05e27d74c7 ("hw/smbios: add core_count2 to smbios table type 4")
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2169904
Signed-off-by: Julia Suvorova <jusual@redhat.com>
Message-Id: <20230223125747.254914-1-jusual@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/smbios/smbios.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 4869566cf5..d2007e70fb 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -750,14 +750,16 @@ static void smbios_build_type_4_table(MachineState *ms,
unsigned instance)
t->core_count = (ms->smp.cores > 255) ? 0xFF : ms->smp.cores;
t->core_enabled = t->core_count;
- t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores);
-
t->thread_count = (ms->smp.threads > 255) ? 0xFF : ms->smp.threads;
- t->thread_count2 = cpu_to_le16(ms->smp.threads);
t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */
t->processor_family2 = cpu_to_le16(0x01); /* Other */
+ if (tbl_len == SMBIOS_TYPE_4_LEN_V30) {
+ t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores);
+ t->thread_count2 = cpu_to_le16(ms->smp.threads);
+ }
+
SMBIOS_BUILD_TABLE_POST;
smbios_type4_count++;
}
--
MST
- [PULL 00/53] virtio,pc,pci: features, cleanups, fixes, Michael S. Tsirkin, 2023/03/02
- [PULL 01/53] hw/smbios: fix field corruption in type 4 table,
Michael S. Tsirkin <=
- [PULL 02/53] Revert "x86: don't let decompressed kernel image clobber setup_data", Michael S. Tsirkin, 2023/03/02
- [PULL 04/53] Revert "x86: re-initialize RNG seed when selecting kernel", Michael S. Tsirkin, 2023/03/02
- [PULL 03/53] Revert "x86: do not re-randomize RNG seed on snapshot load", Michael S. Tsirkin, 2023/03/02
- [PULL 05/53] Revert "x86: reinitialize RNG seed on system reboot", Michael S. Tsirkin, 2023/03/02
- [PULL 09/53] virtio-net: clear guest_announce feature if no cvq backend, Michael S. Tsirkin, 2023/03/02
- [PULL 11/53] vhost-user-gpio: Configure vhost_dev when connecting, Michael S. Tsirkin, 2023/03/02
- [PULL 16/53] docs: vhost-user: replace _SLAVE_ with _BACKEND_, Michael S. Tsirkin, 2023/03/02
- [PULL 07/53] Revert "x86: return modified setup_data only if read as memory, not as file", Michael S. Tsirkin, 2023/03/02
- [PULL 13/53] vhost-user-rng: Back up vqs before cleaning up vhost_dev, Michael S. Tsirkin, 2023/03/02
- [PULL 17/53] libvhost-user: Adopt new backend naming, Michael S. Tsirkin, 2023/03/02