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)
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 9c5278b1cb8c4f524f519e4f54332c5333a8e4a2 Mon Sep 17 00:00:00 2001
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 5 Sep 2024 04:13:36 -0700
|
|
Subject: [PATCH] savevm: Fix load_snapshot error path crash
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
An error path missed setting *errp, which can cause a NULL deref.
|
|
|
|
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
|
|
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
|
|
Message-Id: <20240813050638.446172-11-npiggin@gmail.com>
|
|
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
|
|
Message-Id: <20240813202329.1237572-19-alex.bennee@linaro.org>
|
|
(cherry picked from commit 97d2b66dcd8c771065807b4acfd0002dac4385be)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
migration/savevm.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/migration/savevm.c b/migration/savevm.c
|
|
index d59e976d50..b501504bd5 100644
|
|
--- a/migration/savevm.c
|
|
+++ b/migration/savevm.c
|
|
@@ -3022,6 +3022,7 @@ bool load_snapshot(const char *name, const char *vmstate,
|
|
ret = bdrv_snapshot_find(bs_vm_state, &sn, name);
|
|
aio_context_release(aio_context);
|
|
if (ret < 0) {
|
|
+ error_setg(errp, "Snapshot can not be found");
|
|
return false;
|
|
} else if (sn.vm_state_size == 0) {
|
|
error_setg(errp, "This is a disk-only snapshot. Revert to it "
|
|
--
|
|
2.41.0.windows.1
|
|
|