mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp: restrict non-DMA transfer length to that of available data

Browse Source 
In the case where a SCSI layer transfer is incorrectly terminated, it is
possible for a TI command to cause a SCSI buffer overflow due to the
expected transfer data length being less than the available data in the
FIFO. When this occurs the unsigned async_len variable underflows and
becomes a large offset which writes past the end of the allocated SCSI
buffer.

Restrict the non-DMA transfer length to be the smallest of the expected
transfer length and the available FIFO data to ensure that it is no longer
possible for the SCSI buffer overflow to occur.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1810
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20230913204410.65650-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 77668e4b9b)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Mark Cave-Ayland 2023-09-13 21:44:09 +01:00 committed by Michael Tokarev
parent 9b7feb87d0
commit fa2f090d62
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/scsi/esp.c
View File

@ -759,7 +759,8 @@ static void esp_do_nodma(ESPState *s)
} }
if (to_device) { if (to_device) {
len = MIN(fifo8_num_used(&s->fifo), ESP_FIFO_SZ); len = MIN(s->async_len, ESP_FIFO_SZ);
len = MIN(len, fifo8_num_used(&s->fifo));
esp_fifo_pop_buf(&s->fifo, s->async_buf, len); esp_fifo_pop_buf(&s->fifo, s->async_buf, len);
s->async_buf += len; s->async_buf += len;
s->async_len -= len; s->async_len -= len;