diff options
| author | Peter Lieven <pl@kamp.de> | 2016-05-24 10:59:28 +0200 |
|---|---|---|
| committer | hyokeun <hyokeun.jeon@samsung.com> | 2016-07-27 19:34:16 +0900 |
| commit | c941cda8cd63cdcc32ca1093407234495133c3b0 (patch) | |
| tree | b507a59558d692960d8e151f6755d6ce9dd9c44c | |
| parent | f17a440ace199ac714cb9c12ea33aa2e18259984 (diff) | |
| download | qemu-c941cda8cd63cdcc32ca1093407234495133c3b0.tar.gz qemu-c941cda8cd63cdcc32ca1093407234495133c3b0.tar.bz2 qemu-c941cda8cd63cdcc32ca1093407234495133c3b0.zip | |
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>
(cherry picked from commit a6b3167fa0e825aebb5a7cd8b437b6d41584a196)
[BR: CVE-2016-5126 BSC#982285]
Signed-off-by: Bruce Rogers <brogers@suse.com>
| -rw-r--r-- | block/iscsi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index 302baf84c..172e6cfcc 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -837,6 +837,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", |