From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XifmP-0007j4-MM for qemu-devel@nongnu.org; Mon, 27 Oct 2014 04:36:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XifmG-0007rq-QF for qemu-devel@nongnu.org; Mon, 27 Oct 2014 04:35:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41961) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XifmG-0007rl-Gv for qemu-devel@nongnu.org; Mon, 27 Oct 2014 04:35:48 -0400 Message-ID: <544E03D4.5090004@redhat.com> Date: Mon, 27 Oct 2014 09:35:32 +0100 From: Max Reitz MIME-Version: 1.0 References: <1414253919-3044-1-git-send-email-pl@kamp.de> <1414253919-3044-7-git-send-email-pl@kamp.de> In-Reply-To: <1414253919-3044-7-git-send-email-pl@kamp.de> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv5 6/6] block/iscsi: check for oversized requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Lieven , qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, benoit@irqsave.net, ronniesahlberg@gmail.com, armbru@redhat.com, stefanha@redhat.com On 2014-10-25 at 18:18, Peter Lieven wrote: > Cancel oversized requests early. They would generate > an iSCSI protocol error anyway; after having transferred > possibly a lot of data over the wire. > > Suggested-By: Max Reitz > Signed-off-by: Peter Lieven > --- > block/iscsi.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/block/iscsi.c b/block/iscsi.c > index 85131b7..8747fc3 100644 > --- a/block/iscsi.c > +++ b/block/iscsi.c > @@ -367,6 +367,12 @@ static int coroutine_fn iscsi_co_writev(BlockDriverState *bs, > return -EINVAL; > } > > + if (bs->bl.max_transfer_length && nb_sectors > bs->bl.max_transfer_length) { > + error_report("iSCSI Error: Write of %d sectors exceeds max_xfer_len " > + "of %d sectors.", nb_sectors, bs->bl.max_transfer_length); > + return -EINVAL; > + } > + > lba = sector_qemu2lun(sector_num, iscsilun); > num_sectors = sector_qemu2lun(nb_sectors, iscsilun); > iscsi_co_init_iscsitask(iscsilun, &iTask); > @@ -534,6 +540,12 @@ static int coroutine_fn iscsi_co_readv(BlockDriverState *bs, > return -EINVAL; > } > > + if (bs->bl.max_transfer_length && nb_sectors > bs->bl.max_transfer_length) { > + error_report("iSCSI Error: Read of %d sectors exceeds max_xfer_len " > + "of %d sectors.", nb_sectors, bs->bl.max_transfer_length); > + return -EINVAL; > + } > + > if (iscsilun->lbprz && nb_sectors >= ISCSI_CHECKALLOC_THRES && > !iscsi_allocationmap_is_allocated(iscsilun, sector_num, nb_sectors)) { > int64_t ret; I think to remember someone telling me there should not be full stops at the end of error messages. I can cope with it, though. Reviewed-by: Max Reitz