From patchwork Sat Feb 22 12:17:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 323151 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C29082C014B for ; Sat, 22 Feb 2014 23:19:51 +1100 (EST) Received: from localhost ([::1]:49273 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHBYa-0003vg-7C for incoming@patchwork.ozlabs.org; Sat, 22 Feb 2014 07:19:48 -0500 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 Received: (qmail 5154 invoked by uid 89); 22 Feb 2014 12:19:20 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98.1/18505. hbedv: 8.2.14.12/7.11.133.40. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.5/5.0):. Processed in 1.60072 secs); 22 Feb 2014 12:19:20 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 22 Feb 2014 12:19:19 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id ED1FE20695; Sat, 22 Feb 2014 13:18:18 +0100 (CET) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id D2FFE5FE5B; Sat, 22 Feb 2014 13:18:18 +0100 (CET) From: Peter Lieven To: qemu-devel@nongnu.org Date: Sat, 22 Feb 2014 13:17:24 +0100 Message-Id: <1393071444-29556-1-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, peter.maydell@linaro.org, stefanha@redhat.com, Peter Lieven , qemu-stable@nongnu.org, ronniesahlberg@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH] block/iscsi: fix segfault if writesame fails X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }