diff options
| author | Prasad J Pandit | 2016-05-31 19:53:27 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2016-06-16 18:39:05 +0200 |
| commit | d3cdc49138c30be1d3c2f83d18f85d9fdee95f1a (patch) | |
| tree | 62a3a97c44dcc93650cf9a3b7f0dbd9bc0904e49 /hw/scsi/esp.c | |
| parent | nbd: Avoid magic number for NBD max name size (diff) | |
| download | qemu-d3cdc49138c30be1d3c2f83d18f85d9fdee95f1a.tar.gz qemu-d3cdc49138c30be1d3c2f83d18f85d9fdee95f1a.tar.xz qemu-d3cdc49138c30be1d3c2f83d18f85d9fdee95f1a.zip | |
scsi: esp: check buffer length before reading scsi command
The 53C9X Fast SCSI Controller(FSC) comes with an internal 16-byte
FIFO buffer. It is used to handle command and data transfer.
Routine get_cmd() in non-DMA mode, uses 'ti_size' to read scsi
command into a buffer. Add check to validate command length against
buffer size to avoid any overrun.
Reported-by: Li Qiang <liqiang6-s@360.cn>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-Id: <1464717207-7549-1-git-send-email-ppandit@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/scsi/esp.c')
| -rw-r--r-- | hw/scsi/esp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 3adb685177..4b94bbca67 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -98,6 +98,9 @@ static uint32_t get_cmd(ESPState *s, uint8_t *buf, uint8_t buflen) s->dma_memory_read(s->dma_opaque, buf, dmalen); } else { dmalen = s->ti_size; + if (dmalen > TI_BUFSZ) { + return 0; + } memcpy(buf, s->ti_buf, dmalen); buf[0] = buf[2] >> 5; } |