From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHEeQ-0002vU-24 for qemu-devel@nongnu.org; Sat, 22 Feb 2014 10:38:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WHEeI-00088E-60 for qemu-devel@nongnu.org; Sat, 22 Feb 2014 10:38:02 -0500 Message-ID: <5308BB6D.5070705@redhat.com> Date: Sat, 22 Feb 2014 15:59:57 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1393071444-29556-1-git-send-email-pl@kamp.de> In-Reply-To: <1393071444-29556-1-git-send-email-pl@kamp.de> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] block/iscsi: fix segfault if writesame fails List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Lieven , qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, ronniesahlberg@gmail.com, stefanha@redhat.com, qemu-stable@nongnu.org Il 22/02/2014 13:17, Peter Lieven ha scritto: > commit fa6252b0 introduced a segfault because it tries > to read iTask.task->sense after iTask.task has been > freed. > > CC: qemu-stable@nongnu.org Not needed, it's not in the 1.7.1 pending release. Applied to scsi-next, thanks. Paolo > 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; > } > >