From patchwork Fri Aug 14 11:33:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 507356 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 04F87140293 for ; Fri, 14 Aug 2015 21:34:56 +1000 (AEST) Received: from localhost ([::1]:45730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQDG9-0006xD-Ir for incoming@patchwork.ozlabs.org; Fri, 14 Aug 2015 07:34:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQDFh-0006Mb-Vc for qemu-devel@nongnu.org; Fri, 14 Aug 2015 07:34:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQDFd-00035Q-Rz for qemu-devel@nongnu.org; Fri, 14 Aug 2015 07:34:25 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:51854 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQDFd-00033P-Eu for qemu-devel@nongnu.org; Fri, 14 Aug 2015 07:34:21 -0400 Received: (qmail 16979 invoked by uid 89); 14 Aug 2015 11:34:19 -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.7/20787. hbedv: 8.3.32.46/7.12.0.60. spamassassin: 3.4.0. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 0.797255 secs); 14 Aug 2015 11:34:19 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 14 Aug 2015 11:34:18 -0000 X-GL_Whitelist: yes Received: from lieven-pc (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 74383E005A; Fri, 14 Aug 2015 13:33:38 +0200 (CEST) Received: by lieven-pc (Postfix, from userid 1000) id 5A76520461; Fri, 14 Aug 2015 13:33:38 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 14 Aug 2015 13:33:36 +0200 Message-Id: <1439552016-8557-1-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: pbonzini@redhat.com, andrey@xdel.ru, Peter Lieven , qemu-stable@nongnu.org, ronniesahlberg@gmail.com Subject: [Qemu-devel] [PATCH] block/iscsi: validate block size returned from target 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 It has been reported that at least tgtd returns a block size of 0 for LUN 0. To avoid running into divide by zero later on and protect against other problematic block sizes validate the block size right at connection time. Cc: qemu-stable@nongnu.org Reported-by: Andrey Korolyov Signed-off-by: Peter Lieven --- block/iscsi.c | 4 ++++ dtc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 5002916..fac3a7a 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1214,6 +1214,10 @@ static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp) if (task == NULL || task->status != SCSI_STATUS_GOOD) { error_setg(errp, "iSCSI: failed to send readcapacity10 command."); + } else if (!iscsilun->block_size || + iscsilun->block_size % BDRV_SECTOR_SIZE) { + error_setg(errp, "iSCSI: the target returned an invalid " + "block size of %d.", iscsilun->block_size); } if (task) { scsi_free_scsi_task(task);