[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 06/13] scsi-disk: Fix crash if underlying host file o
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 06/13] scsi-disk: Fix crash if underlying host file or disk returns error |
Date: |
Thu, 22 Nov 2018 17:54:10 +0100 |
From: "Richard W.M. Jones" <address@hidden>
Commit 40dce4ee6 "scsi-disk: fix rerror/werror=ignore" introduced a
bug which causes qemu to crash with the assertion error below if the
host file or disk returns an error:
qemu-system-x86_64: hw/scsi/scsi-bus.c:1374: scsi_req_complete:
Assertion `req->status == -1' failed.
Kevin Wolf suggested this fix:
< kwolf> Hm, should the final return false; in that patch
actually be a return true?
< kwolf> Because I think he didn't intend to change anything
except BLOCK_ERROR_ACTION_IGNORE
Buglink: https://bugs.launchpad.net/qemu/+bug/1804323
Fixes: 40dce4ee61c68395f6d463fae792f61b7c003bce
Signed-off-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/scsi/scsi-disk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 6eb258d3f3..0e9027c8f3 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -482,7 +482,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int error,
bool acct_failed)
if (action == BLOCK_ERROR_ACTION_STOP) {
scsi_req_retry(&r->req);
}
- return false;
+ return true;
}
static void scsi_write_complete_noio(SCSIDiskReq *r, int ret)
--
2.19.1
- [Qemu-block] [PULL 00/13] Block layer patches, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 01/13] iotests: Replace time.clock() with Timeout, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 02/13] iotests: Replace assertEquals() with assertEqual(), Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 03/13] iotests: Skip 233 if certtool not installed, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 04/13] qemu-img: Fix typo, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 05/13] qemu-img: Fix leak, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 06/13] scsi-disk: Fix crash if underlying host file or disk returns error,
Kevin Wolf <=
- [Qemu-block] [PULL 07/13] block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options(), Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 08/13] iotests: fix nbd test 233 to work correctly with raw images, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 09/13] nvme: call blk_drain in NVMe reset code to avoid lockups, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 10/13] nvme: fix out-of-bounds access to the CMB, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 11/13] Revert "nvme: fix oob access issue(CVE-2018-16847)", Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 12/13] nvme: fix bug with PCI IRQ pins on teardown, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 13/13] iotests: Enhance 223 to cover multiple bitmap granularities, Kevin Wolf, 2018/11/22
- Re: [Qemu-block] [PULL 00/13] Block layer patches, Peter Maydell, 2018/11/22
- Re: [Qemu-block] [Qemu-devel] [PULL 00/13] Block layer patches, no-reply, 2018/11/23