From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b58Bk-0003fw-V3 for qemu-devel@nongnu.org; Tue, 24 May 2016 04:59:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b58Be-0000SR-9H for qemu-devel@nongnu.org; Tue, 24 May 2016 04:59:43 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:58083 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b58Bd-0000R0-Us for qemu-devel@nongnu.org; Tue, 24 May 2016 04:59:38 -0400 From: Peter Lieven Date: Tue, 24 May 2016 10:59:28 +0200 Message-Id: <1464080368-29584-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH] block/iscsi: avoid potential overflow of acb->task->cdb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, pbonzini@redhat.com, famz@redhat.com, Peter Lieven , qemu-stable@nongnu.org at least in the path via virtio-blk the maximum size is not restricted. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Lieven --- block/iscsi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index 2ca8e72..e7d5f7b 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -833,6 +833,13 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, return &acb->common; } + if (acb->ioh->cmd_len > SCSI_CDB_MAX_SIZE) { + error_report("iSCSI: ioctl error CDB exceeds max size (%d > %d)", + acb->ioh->cmd_len, SCSI_CDB_MAX_SIZE); + qemu_aio_unref(acb); + return NULL; + } + acb->task = malloc(sizeof(struct scsi_task)); if (acb->task == NULL) { error_report("iSCSI: Failed to allocate task for scsi command. %s", -- 1.9.1