block/iscsi: avoid potential overflow of acb->task->cdb

at least in the path via virtio-blk the maximum size is not
restricted.

Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Lieven <pl@kamp.de>
Message-Id: <1464080368-29584-1-git-send-email-pl@kamp.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Lieven 2016-05-24 10:59:28 +02:00 committed by Paolo Bonzini
parent b60bdd1f1e
commit a6b3167fa0

View File

@ -833,6 +833,13 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs,
return &acb->common; 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)); acb->task = malloc(sizeof(struct scsi_task));
if (acb->task == NULL) { if (acb->task == NULL) {
error_report("iSCSI: Failed to allocate task for scsi command. %s", error_report("iSCSI: Failed to allocate task for scsi command. %s",