From patchwork Tue Jan 22 14:19:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 214570 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D10D32C007E for ; Wed, 23 Jan 2013 01:49:56 +1100 (EST) Received: from localhost ([::1]:50494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Txeip-0008Rq-Q3 for incoming@patchwork.ozlabs.org; Tue, 22 Jan 2013 09:21:07 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Txei3-0006fA-Ai for qemu-devel@nongnu.org; Tue, 22 Jan 2013 09:20:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Txei0-000660-RE for qemu-devel@nongnu.org; Tue, 22 Jan 2013 09:20:19 -0500 Received: from mail-qc0-f176.google.com ([209.85.216.176]:42657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Txei0-00065h-Ma for qemu-devel@nongnu.org; Tue, 22 Jan 2013 09:20:16 -0500 Received: by mail-qc0-f176.google.com with SMTP id n41so4370957qco.7 for ; Tue, 22 Jan 2013 06:20:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=RdGmGmSVCFCHq40+wCJDDZz+TmZOFi7xbg7806AtfnY=; b=GFiVN5H0QTYyKr1Tsr6bMfYmEwhm3cAlewIwMmlK21TENeVEN3jypZ0WEVsu/0lEpM j9Sn/CeJRxcxof002VcQE1S2S22q0O39rjrjvVvweezhGlxs/Zheh/J0wfCCUlA7SwT+ CadX03EpF9W8PRZ3p2cZCLlJEKx+0iE2vDNSE7qn4yJMUJ3NCq8ZZjQhURVvC/lPMQPc BR1gsfn79U3OiuGgIt3LM6IxPyUTc5joDRVqHOY7ixNZMCrLp5QZYl79fqQ8O7k9wuy2 LWe6il0Zu1Faz+gU4R7n2Kd50yjWZOUhbNhm9PxuWT0asnfu+SAjy8uxv8lU1JOnF4qY CA2A== X-Received: by 10.224.184.70 with SMTP id cj6mr22535979qab.98.1358864416168; Tue, 22 Jan 2013 06:20:16 -0800 (PST) Received: from yakj.usersys.redhat.com ([176.200.151.56]) by mx.google.com with ESMTPS id y1sm11101555qan.22.2013.01.22.06.20.14 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 22 Jan 2013 06:20:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 22 Jan 2013 15:19:54 +0100 Message-Id: <1358864396-3889-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1358864396-3889-1-git-send-email-pbonzini@redhat.com> References: <1358864396-3889-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.176 Subject: [Qemu-devel] [PATCH 4/6] scsi: fix segfault with 0-byte disk 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 When a 0-sized disk is found, READ CAPACITY will return a LUN NOT READY error. However, because it returns -1 instead of zero, the HBA will call scsi_req_continue. This will typically cause a segmentation fault or an assertion failure. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index f8d7ef3..658e315 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1682,7 +1682,7 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf) bdrv_get_geometry(s->qdev.conf.bs, &nb_sectors); if (!nb_sectors) { scsi_check_condition(r, SENSE_CODE(LUN_NOT_READY)); - return -1; + return 0; } if ((req->cmd.buf[8] & 1) == 0 && req->cmd.lba) { goto illegal_request; @@ -1751,7 +1751,7 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf) bdrv_get_geometry(s->qdev.conf.bs, &nb_sectors); if (!nb_sectors) { scsi_check_condition(r, SENSE_CODE(LUN_NOT_READY)); - return -1; + return 0; } if ((req->cmd.buf[14] & 1) == 0 && req->cmd.lba) { goto illegal_request;