ab7fc8ee5b
- target/i386: Introduce SapphireRapids-v3 to add missing features - qtest/fuzz-lsi53c895a-test: set guest RAM to 2G - hw/net/lan9118: Signal TSFL_INT flag when TX FIFO reaches specified level - target/arm: Fix alignment for VLD4.32 - hw/microblaze: pass random seed to fdt - tests/qtest: npcm7xx-emc-test: Skip checking MAC - tests: mark io-command test as skipped if socat is missing - tests: unit: add NULL-pointer check - tests: test-qga: close socket on failure to connect - vdpa:block device capacity expansion online support vdpa block device update capacity. - virtio-net: Ensure queue index fits with RSS(CVE-2024-6505) - nbd/server: CVE-2024-7409: Avoid use-after-free when closing server - ppc/vof: Fix unaligned FDT property access - vvfat: Fix reading files with non-continuous clusters - vvfat: Fix bug in writing to middle of file - savevm: Fix load_snapshot error path crash - hw/dma/xilinx_axidma: Use semicolon at end of statement, not comma - hw/remote/message.c: Don't directly invoke DeviceClass:reset - crypto/tlscredspsk: Free username on finalize - hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() - virtio: remove virtio_tswap16s() call in vring_packed_event_read() - char-stdio: Restore blocking mode of stdout on exit - hw/ppc: spapr: Use qemu_vfree() to free spapr->htab - smbios: sanitize type from external type before checking have_fields_bitmap - spapr_pci: fix leak in spapr_phb_vfio_get_loc_code - KVM: use store-release to mark dirty pages as harvested - monitor/hmp: print trace as option in help for log command - tpm_crb: Avoid backend startup just before shutdown under Xen - crypto/block-luks: make range overlap check more readable - spapr: Free stdout path - target/rx: Use target_ulong for address in LI - virtio-pci: Fix the use of an uninitialized irqfd - rtl8139: Fix behaviour for old kernels. - virtio-rng: block max-bytes=0 MIME-Version: 1.0 - hw/audio/es1370: Clean up comment - vhost-user-server: do not set memory fd non-blocking - ui: reject extended clipboard message if not activated - virtio-net: Fix vhost virtqueue notifiers for RSS - hw/misc/applesmc: Fix memory leak in reset() handler Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit db7a5d9a7239db307c8c1454fab5f8a92fd486b8)
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 27179c493623b7758aead29955e96a6c52248502 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 4 Sep 2024 07:56:16 +0000
|
|
Subject: [PATCH] smbios: sanitize type from external type before checking
|
|
have_fields_bitmap mainline inclusion commit
|
|
57e3069641d057a9ca90bb603c86477d5b331ecd category: bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
test_bit uses header->type as an offset; if the file incorrectly specifies a
|
|
type greater than 127, smbios_entry_add will read and write garbage.
|
|
|
|
To fix this, just pass the smbios data through, assuming the user knows what
|
|
to do. Reported by Coverity as CID 1487255.
|
|
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/smbios/smbios.c | 14 ++++++++------
|
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
|
|
index f73b9417c8..d506fd4e7e 100644
|
|
--- a/hw/smbios/smbios.c
|
|
+++ b/hw/smbios/smbios.c
|
|
@@ -1171,13 +1171,15 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
|
|
return;
|
|
}
|
|
|
|
- if (test_bit(header->type, have_fields_bitmap)) {
|
|
- error_setg(errp,
|
|
- "can't load type %d struct, fields already specified!",
|
|
- header->type);
|
|
- return;
|
|
+ if (header->type <= SMBIOS_MAX_TYPE) {
|
|
+ if (test_bit(header->type, have_fields_bitmap)) {
|
|
+ error_setg(errp,
|
|
+ "can't load type %d struct, fields already specified!",
|
|
+ header->type);
|
|
+ return;
|
|
+ }
|
|
+ set_bit(header->type, have_binfile_bitmap);
|
|
}
|
|
- set_bit(header->type, have_binfile_bitmap);
|
|
|
|
if (header->type == 4) {
|
|
smbios_type4_count++;
|
|
--
|
|
2.41.0.windows.1
|
|
|