c4dab45526
- qga/win32: Use rundll for VSS installation - qga/win32: Remove change action from MSI installer - ide: Increment BB in-flight counter for TRIM BH - hw/pci-bridge/pxb: Fix missing swizzle - host-vdpa: make notifiers _init()/_uninit() symmetric - hw/virtio: vdpa: Fix leak of host-notifier memory-region - accel/tcg/cpu-exec: Fix precise single-stepping after interrupt - Allow setting up to 8 bytes with the generic loader - hw/net/virtio-net: make some VirtIONet const - accel/tcg: Optimize jump cache flush during tlb range flush - 9pfs: prevent opening special files (CVE-2023-2861) - tcg: Reduce tcg_assert_listed_vecop() scope - gitlab: Disable plugins for cross-i386-tci - vfio/pci: Fix a segfault in vfio_realize - block/iscsi: fix double-free on BUSY or similar statuses - tests/tcg: fix unused variable in linux-test - hw/net/vmxnet3: allow VMXNET3_MAX_MTU itself as a value - qga/vss-win32: fix warning for clang++-15 - vnc: avoid underflow when accessing user-provided address - block/monitor: Fix crash when executing HMP commit - virtio-gpu: add a FIXME for virtio_gpu_load() - hw/ppc/Kconfig: MAC_NEWWORLD should always select USB_OHCI_PCI - migration: report compress thread pid to libvirt Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 2d37c08cc6f274c48a4a65a446788e946f0363c0 Mon Sep 17 00:00:00 2001
|
|
From: qihao <qihao_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 28 Jun 2023 10:58:55 +0800
|
|
Subject: [PATCH] block/iscsi: fix double-free on BUSY or similar statuses
|
|
|
|
cheery-pick from 5080152e2ef6cde7aa692e29880c62bd54acb750
|
|
|
|
Commit 8c460269aa77 ("iscsi: base all handling of check condition on
|
|
scsi_sense_to_errno", 2019-07-15) removed a "goto out" so that the
|
|
same coroutine is re-entered twice; once from iscsi_co_generic_cb,
|
|
once from the timer callback iscsi_retry_timer_expired. This can
|
|
cause a crash.
|
|
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1378
|
|
Reported-by: Grzegorz Zdanowski <https://gitlab.com/kiler129>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
|
---
|
|
block/iscsi.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/block/iscsi.c b/block/iscsi.c
|
|
index 57aa07a40d..61ccb58fc8 100644
|
|
--- a/block/iscsi.c
|
|
+++ b/block/iscsi.c
|
|
@@ -268,6 +268,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
|
|
timer_mod(&iTask->retry_timer,
|
|
qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + retry_time);
|
|
iTask->do_retry = 1;
|
|
+ return;
|
|
} else if (status == SCSI_STATUS_CHECK_CONDITION) {
|
|
int error = iscsi_translate_sense(&task->sense);
|
|
if (error == EAGAIN) {
|
|
--
|
|
2.41.0.windows.1
|
|
|