[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/16] esp.c: don't assert() if FIFO empty when executing non-
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 09/16] esp.c: don't assert() if FIFO empty when executing non-DMA SELATNS |
Date: |
Wed, 13 Mar 2024 08:58:03 +0000 |
The current logic assumes that at least 1 byte is present in the FIFO when
executing a non-DMA SELATNS command, but this may not be the case if the
guest executes an invalid ESP command sequence.
Reported-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 6b7a972947..55143a1208 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -762,7 +762,8 @@ static void esp_do_nodma(ESPState *s)
case CMD_SELATNS:
/* Copy one byte from FIFO into cmdfifo */
- len = esp_fifo_pop_buf(s, buf, 1);
+ len = esp_fifo_pop_buf(s, buf,
+ MIN(fifo8_num_used(&s->fifo), 1));
len = MIN(fifo8_num_free(&s->cmdfifo), len);
fifo8_push_all(&s->cmdfifo, buf, len);
--
2.39.2
- [PATCH v2 04/16] esp.c: change esp_fifo_push() to take ESPState, (continued)
- [PATCH v2 04/16] esp.c: change esp_fifo_push() to take ESPState, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 05/16] esp.c: change esp_fifo_pop() to take ESPState, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 06/16] esp.c: use esp_fifo_push() instead of fifo8_push(), Mark Cave-Ayland, 2024/03/13
- [PATCH v2 07/16] esp.c: change esp_fifo_pop_buf() to take ESPState, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 08/16] esp.c: introduce esp_fifo_push_buf() function for pushing to the FIFO, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 09/16] esp.c: don't assert() if FIFO empty when executing non-DMA SELATNS,
Mark Cave-Ayland <=
- [PATCH v2 10/16] esp.c: don't assert() if FIFO empty when executing esp_cdb_length(), Mark Cave-Ayland, 2024/03/13
- [PATCH v2 12/16] esp.c: move esp_set_phase() and esp_get_phase() towards the beginning of the file, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 11/16] esp.c: don't overflow cmdfifo if cmdfifo_cdb_offset >= ESP_CMDFIFO_SZ, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 14/16] esp.c: update esp_fifo_{push, pop}() to call esp_update_drq(), Mark Cave-Ayland, 2024/03/13
- [PATCH v2 15/16] esp.c: ensure esp_pdma_write() always calls esp_fifo_push(), Mark Cave-Ayland, 2024/03/13
- [PATCH v2 13/16] esp.c: introduce esp_update_drq() and update esp_fifo_{push, pop}_buf() to use it, Mark Cave-Ayland, 2024/03/13