|
 |
b82b233 |
------------------------------------------------------------------------
|
|
|
b82b233 |
*From*: P J P
|
|
|
b82b233 |
*Subject*: [Qemu-devel] [PATCH v3] scsi: esp: check TI buffer index
|
|
|
b82b233 |
before read/write
|
|
|
b82b233 |
*Date*: Mon, 6 Jun 2016 22:04:43 +0530
|
|
|
b82b233 |
|
|
|
b82b233 |
------------------------------------------------------------------------
|
|
|
b82b233 |
|
|
|
b82b233 |
From: Prasad J Pandit <address@hidden>
|
|
|
b82b233 |
|
|
|
b82b233 |
The 53C9X Fast SCSI Controller(FSC) comes with internal 16-byte
|
|
|
b82b233 |
FIFO buffers. One is used to handle commands and other is for
|
|
|
b82b233 |
information transfer. Three control variables 'ti_rptr',
|
|
|
b82b233 |
'ti_wptr' and 'ti_size' are used to control r/w access to the
|
|
|
b82b233 |
information transfer buffer ti_buf[TI_BUFSZ=16]. In that,
|
|
|
b82b233 |
|
|
|
b82b233 |
'ti_rptr' is used as read index, where read occurs.
|
|
|
b82b233 |
'ti_wptr' is a write index, where write would occur.
|
|
|
b82b233 |
'ti_size' indicates total bytes to be read from the buffer.
|
|
|
b82b233 |
|
|
|
b82b233 |
While reading/writing to this buffer, index could exceed its
|
|
|
b82b233 |
size. Add check to avoid OOB r/w access.
|
|
|
b82b233 |
|
|
|
b82b233 |
Reported-by: Huawei PSIRT <address@hidden>
|
|
|
b82b233 |
Reported-by: Li Qiang <address@hidden>
|
|
|
b82b233 |
Signed-off-by: Prasad J Pandit <address@hidden>
|
|
|
b82b233 |
---
|
|
|
b82b233 |
hw/scsi/esp.c | 20 +++++++++-----------
|
|
|
b82b233 |
1 file changed, 9 insertions(+), 11 deletions(-)
|
|
|
b82b233 |
|
|
|
b82b233 |
Update as per:
|
|
|
b82b233 |
-> https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg01326.html
|
|
|
b82b233 |
|
|
|
b82b233 |
diff --git a/tools/qemu-xen/hw/scsi/esp.c b/tools/qemu-xen/hw/scsi/esp.c
|
|
|
b82b233 |
index c2f6f8f..4b94bbc 100644
|
|
|
b82b233 |
--- a/tools/qemu-xen/hw/scsi/esp.c
|
|
|
b82b233 |
+++ b/tools/qemu-xen/hw/scsi/esp.c
|
|
|
b82b233 |
@@ -403,19 +403,17 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr)
|
|
|
b82b233 |
trace_esp_mem_readb(saddr, s->rregs[saddr]);
|
|
|
b82b233 |
switch (saddr) {
|
|
|
b82b233 |
case ESP_FIFO:
|
|
|
b82b233 |
- if (s->ti_size > 0) {
|
|
|
b82b233 |
+ if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) == 0) {
|
|
|
b82b233 |
+ /* Data out. */
|
|
|
b82b233 |
+ qemu_log_mask(LOG_UNIMP, "esp: PIO data read not implemented\n");
|
|
|
b82b233 |
+ s->rregs[ESP_FIFO] = 0;
|
|
|
b82b233 |
+ esp_raise_irq(s);
|
|
|
b82b233 |
+ } else if (s->ti_rptr < s->ti_wptr) {
|
|
|
b82b233 |
s->ti_size--;
|
|
|
b82b233 |
- if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) == 0) {
|
|
|
b82b233 |
- /* Data out. */
|
|
|
b82b233 |
- qemu_log_mask(LOG_UNIMP,
|
|
|
b82b233 |
- "esp: PIO data read not implemented\n");
|
|
|
b82b233 |
- s->rregs[ESP_FIFO] = 0;
|
|
|
b82b233 |
- } else {
|
|
|
b82b233 |
- s->rregs[ESP_FIFO] = s->ti_buf[s->ti_rptr++];
|
|
|
b82b233 |
- }
|
|
|
b82b233 |
+ s->rregs[ESP_FIFO] = s->ti_buf[s->ti_rptr++];
|
|
|
b82b233 |
esp_raise_irq(s);
|
|
|
b82b233 |
}
|
|
|
b82b233 |
- if (s->ti_size == 0) {
|
|
|
b82b233 |
+ if (s->ti_rptr == s->ti_wptr) {
|
|
|
b82b233 |
s->ti_rptr = 0;
|
|
|
b82b233 |
s->ti_wptr = 0;
|
|
|
b82b233 |
}
|
|
|
b82b233 |
@@ -459,7 +457,7 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
|
|
|
b82b233 |
} else {
|
|
|
b82b233 |
trace_esp_error_fifo_overrun();
|
|
|
b82b233 |
}
|
|
|
b82b233 |
- } else if (s->ti_size == TI_BUFSZ - 1) {
|
|
|
b82b233 |
+ } else if (s->ti_wptr == TI_BUFSZ - 1) {
|
|
|
b82b233 |
trace_esp_error_fifo_overrun();
|
|
|
b82b233 |
} else {
|
|
|
b82b233 |
s->ti_size++;
|
|
|
b82b233 |
--
|
|
|
b82b233 |
2.5.5
|
|
|
b82b233 |
|