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)
67 lines
2.6 KiB
Diff
67 lines
2.6 KiB
Diff
From ed1ffd883ab3bfbcd3a11d63a7aba6a3a3f53372 Mon Sep 17 00:00:00 2001
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 11 Apr 2024 01:04:58 -0700
|
|
Subject: [PATCH] block/mirror: Fix NULL s->job in active writes
|
|
|
|
There is a small gap in mirror_start_job() before putting the mirror
|
|
filter node into the block graph (bdrv_append() call) and the actual job
|
|
being created. Before the job is created, MirrorBDSOpaque.job is NULL.
|
|
|
|
It is possible that requests come in when bdrv_drained_end() is called,
|
|
and those requests would see MirrorBDSOpaque.job == NULL. Have our
|
|
filter node handle that case gracefully.
|
|
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
Message-Id: <20221109165452.67927-4-hreitz@redhat.com>
|
|
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit da93d5c84e56e6b4e84aa8e98b6b984c9b6bb528)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
block/mirror.c | 20 ++++++++++++--------
|
|
1 file changed, 12 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/block/mirror.c b/block/mirror.c
|
|
index d1863565c4..de020bdb3e 100644
|
|
--- a/block/mirror.c
|
|
+++ b/block/mirror.c
|
|
@@ -1420,11 +1420,13 @@ static int coroutine_fn bdrv_mirror_top_do_write(BlockDriverState *bs,
|
|
MirrorOp *op = NULL;
|
|
MirrorBDSOpaque *s = bs->opaque;
|
|
int ret = 0;
|
|
- bool copy_to_target;
|
|
+ bool copy_to_target = false;
|
|
|
|
- copy_to_target = s->job->ret >= 0 &&
|
|
- !job_is_cancelled(&s->job->common.job) &&
|
|
- s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
|
|
+ if (s->job) {
|
|
+ copy_to_target = s->job->ret >= 0 &&
|
|
+ !job_is_cancelled(&s->job->common.job) &&
|
|
+ s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
|
|
+ }
|
|
|
|
if (copy_to_target) {
|
|
op = active_write_prepare(s->job, offset, bytes);
|
|
@@ -1469,11 +1471,13 @@ static int coroutine_fn bdrv_mirror_top_pwritev(BlockDriverState *bs,
|
|
QEMUIOVector bounce_qiov;
|
|
void *bounce_buf;
|
|
int ret = 0;
|
|
- bool copy_to_target;
|
|
+ bool copy_to_target = false;
|
|
|
|
- copy_to_target = s->job->ret >= 0 &&
|
|
- !job_is_cancelled(&s->job->common.job) &&
|
|
- s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
|
|
+ if (s->job) {
|
|
+ copy_to_target = s->job->ret >= 0 &&
|
|
+ !job_is_cancelled(&s->job->common.job) &&
|
|
+ s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
|
|
+ }
|
|
|
|
if (copy_to_target) {
|
|
/* The guest might concurrently modify the data to write; but
|
|
--
|
|
2.27.0
|
|
|