From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHBYH-0003vW-A6 for qemu-devel@nongnu.org; Sat, 22 Feb 2014 07:19:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WHBYC-0007e0-GE for qemu-devel@nongnu.org; Sat, 22 Feb 2014 07:19:29 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:34855 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHBYC-0007bz-6F for qemu-devel@nongnu.org; Sat, 22 Feb 2014 07:19:24 -0500 From: Peter Lieven Date: Sat, 22 Feb 2014 13:17:24 +0100 Message-Id: <1393071444-29556-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH] block/iscsi: fix segfault if writesame fails List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, stefanha@redhat.com, Peter Lieven , qemu-stable@nongnu.org, ronniesahlberg@gmail.com, pbonzini@redhat.com commit fa6252b0 introduced a segfault because it tries to read iTask.task->sense after iTask.task has been freed. CC: qemu-stable@nongnu.org Signed-off-by: Peter Lieven --- block/iscsi.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index f8e496f..123fa06 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -830,6 +830,15 @@ retry: qemu_coroutine_yield(); } + if (iTask.status == SCSI_STATUS_CHECK_CONDITION && + iTask.task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && + iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { + /* WRITE SAME is not supported by the target */ + iscsilun->has_write_same = false; + scsi_free_scsi_task(iTask.task); + return -ENOTSUP; + } + if (iTask.task != NULL) { scsi_free_scsi_task(iTask.task); iTask.task = NULL; @@ -840,14 +849,6 @@ retry: } if (iTask.status != SCSI_STATUS_GOOD) { - if (iTask.status == SCSI_STATUS_CHECK_CONDITION && - iTask.task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && - iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { - /* WRITE SAME is not supported by the target */ - iscsilun->has_write_same = false; - return -ENOTSUP; - } - return -EIO; } -- 1.7.9.5