[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 49/52] block/iscsi: fix initialization of iTask in is
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 49/52] block/iscsi: fix initialization of iTask in iscsi_co_get_block_status |
Date: |
Fri, 12 Jan 2018 12:31:13 +0100 |
From: Peter Lieven <address@hidden>
in case of unaligned requests or on a target that does not support
block provisioning we leave iTask uninitialized and check iTask.task
for NULL later.
Fixes: e38bc23454ef763deb4405ebdee6a1081aa00bc8
Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/iscsi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 5c0a9e5..6a1c537 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -658,6 +658,8 @@ static int64_t coroutine_fn
iscsi_co_get_block_status(BlockDriverState *bs,
uint64_t lba;
int64_t ret;
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+
if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {
ret = -EINVAL;
goto out;
@@ -675,7 +677,6 @@ static int64_t coroutine_fn
iscsi_co_get_block_status(BlockDriverState *bs,
lba = sector_qemu2lun(sector_num, iscsilun);
- iscsi_co_init_iscsitask(iscsilun, &iTask);
qemu_mutex_lock(&iscsilun->mutex);
retry:
if (iscsi_get_lba_status_task(iscsilun->iscsi, iscsilun->lun,
--
1.8.3.1
- [Qemu-devel] [PULL 43/52] chardev: Clean up previous patch indentation, (continued)
- [Qemu-devel] [PULL 43/52] chardev: Clean up previous patch indentation, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 38/52] cpus: unify qemu_*_wait_io_event, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 39/52] irq: fix memory leak, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 41/52] mips: Tweak location of ';' in macros, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 42/52] chardev: Use goto/label instead of do/break/while(0), Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 44/52] tests: Avoid 'do/while(false); ' in vhost-user-bridge, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 46/52] checkpatch: Enforce proper do/while (0) style, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 45/52] maint: Fix macros with broken 'do/while(0); ' usage, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 40/52] net: Drop unusual use of do { } while (0);, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 48/52] find_ram_offset: Align ram_addr_t allocation on long boundaries, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 49/52] block/iscsi: fix initialization of iTask in iscsi_co_get_block_status,
Paolo Bonzini <=
- [Qemu-devel] [PULL 50/52] cpu: flush TB cache when loading VMState, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 52/52] scripts/analyse-locks-simpletrace.py: script to analyse lock times, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 51/52] util/qemu-thread-*: add qemu_lock, locked and unlock trace events, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 47/52] find_ram_offset: Add comments and tracing, Paolo Bonzini, 2018/01/12