From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCvJF-0005gE-Rj for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:05:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCvJB-0008UL-JZ for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:05:49 -0500 Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 5 Mar 2013 18:05:24 +0100 Message-Id: <1362503125-27057-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1362503125-27057-1-git-send-email-pbonzini@redhat.com> References: <1362503125-27057-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 5/6] scsi-disk: do not complete canceled UNMAP requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Canceled requests should never be completed, and doing that could cause accesses to a NULL hba_private field. Cc: qemu-stable@nongnu.org Reported-by: Stefan Priebe Tested-by: Stefan Priebe Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index d411586..6c0ddff 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1478,13 +1478,17 @@ static void scsi_unmap_complete(void *opaque, int ret) uint32_t nb_sectors; r->req.aiocb = NULL; + if (r->req.io_canceled) { + goto done; + } + if (ret < 0) { if (scsi_handle_rw_error(r, -ret)) { goto done; } } - if (data->count > 0 && !r->req.io_canceled) { + if (data->count > 0) { sector_num = ldq_be_p(&data->inbuf[0]); nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL; if (!check_lba_range(s, sector_num, nb_sectors)) { @@ -1501,10 +1505,9 @@ static void scsi_unmap_complete(void *opaque, int ret) return; } + scsi_req_complete(&r->req, GOOD); + done: - if (data->count == 0) { - scsi_req_complete(&r->req, GOOD); - } if (!r->req.io_canceled) { scsi_req_unref(&r->req); } -- 1.8.1.2