9803c6ed12
- hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/display/virtio-gpu: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/virtio: Introduce virtio_bh_new_guarded() helper - hw: replace most qemu_bh_new calls with qemu_bh_new_guarded - checkpatch: add qemu_bh_new/aio_bh_new checks - async: avoid use-after-free on re-entrancy guard - async: Add an optional reentrancy guard to the BH API - hw/sd/sdhci: Do not update TRNMOD when Command Inhibit (DAT) is set(CVE-2024-3447) - rtl8139: Remove unused variable - tulip: Remove unused variable - virtio-mem: Fix the bitmap index of the section offset - virtio-mem: Fix the iterator variable in a vmem->rdl_list loop - system/memory: use ldn_he_p/stn_he_p - block: Fix crash when loading snapshot on inactive node - smmu: Clear SMMUPciBus pointer cache when system reset - block/mirror: Fix NULL s->job in active writes - amd_iommu: Fix APIC address check - virtio-crypto: fix NULL pointer dereference in virtio_crypto_free_reques - libqos/virtio.c: Correct 'flags' reading in qvirtqueue_kick cherry-pick from 66e411885a23c96ff73742d06b793fec3ceaebb7 - ivshmem-test.c: enable test_ivshmem_server for ppc64 arch - ivshmem.c: change endianness to LITTLE_ENDIAN - hw/ppc/mac.h: Remove MAX_CPUS macro - configure: remove dead variables - virtio-gpu: do not byteswap padding - hw/intc: clean-up error reporting for failed ITS cmd - qemu-iotests: Discard stderr when probing devices - linux-user: un-parent OBJECT(cpu) when closing thread - hw/net/rocker: Avoid undefined shifts with more than 31 ports - contrib/vhost-user-blk: Clean up deallocation of VuVirtqElement - scsi-disk: fix overflow when block size is not a multiple of BDRV_SECTOR_SIZE Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit bf54b48c2963c869dfdc89977c57be4bd9e772aa)
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From aad76e8af00e2d507de9a2e562bdbc43a3bc2bc8 Mon Sep 17 00:00:00 2001
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 8 Apr 2024 00:42:25 -0700
|
|
Subject: [PATCH] block: Fix crash when loading snapshot on inactive node
|
|
|
|
bdrv_is_read_only() only checks if the node is configured to be
|
|
read-only eventually, but even if it returns false, writing to the node
|
|
may not be permitted at the moment (because it's inactive).
|
|
|
|
bdrv_is_writable() checks that the node can be written to right now, and
|
|
this is what the snapshot operations really need.
|
|
|
|
Change bdrv_can_snapshot() to use bdrv_is_writable() to fix crashes like
|
|
the following:
|
|
|
|
$ ./qemu-system-x86_64 -hda /tmp/test.qcow2 -loadvm foo -incoming defer
|
|
qemu-system-x86_64: ../block/io.c:1990: int bdrv_co_write_req_prepare(BdrvChild *, int64_t, int64_t, BdrvTrackedRequest *, int): Assertion `!(bs->open_flags & BDRV_O_INACTIVE)' failed.
|
|
|
|
The resulting error message after this patch isn't perfect yet, but at
|
|
least it doesn't crash any more:
|
|
|
|
$ ./qemu-system-x86_64 -hda /tmp/test.qcow2 -loadvm foo -incoming defer
|
|
qemu-system-x86_64: Device 'ide0-hd0' is writable but does not support snapshots
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Message-ID: <20231201142520.32255-2-kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit d3007d348adaaf04ee8b099a475282034a662414)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
block/snapshot.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/block/snapshot.c b/block/snapshot.c
|
|
index ccacda8bd5..f5703aa28b 100644
|
|
--- a/block/snapshot.c
|
|
+++ b/block/snapshot.c
|
|
@@ -200,7 +200,7 @@ static BlockDriverState *bdrv_snapshot_fallback(BlockDriverState *bs)
|
|
int bdrv_can_snapshot(BlockDriverState *bs)
|
|
{
|
|
BlockDriver *drv = bs->drv;
|
|
- if (!drv || !bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
|
|
+ if (!drv || !bdrv_is_inserted(bs) || !bdrv_is_writable(bs)) {
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|