[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/6] esp: don't underflow cmdfifo if no message out/command da
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 1/6] esp: don't underflow cmdfifo if no message out/command data is present |
Date: |
Wed, 17 Mar 2021 23:02:18 +0000 |
If a guest sends a TI (Transfer Information) command without previously sending
any message out/command phase data then cmdfifo will underflow triggering an
assert reading the IDENTIFY byte.
Buglink: https://bugs.launchpad.net/qemu/+bug/1919035
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 507ab363bc..5d3f1ccbc8 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -318,18 +318,24 @@ static void do_busid_cmd(ESPState *s, uint8_t busid)
static void do_cmd(ESPState *s)
{
- uint8_t busid = fifo8_pop(&s->cmdfifo);
+ uint8_t busid;
uint32_t n;
- s->cmdfifo_cdb_offset--;
+ if (fifo8_num_used(&s->cmdfifo)) {
+ busid = fifo8_pop(&s->cmdfifo);
- /* Ignore extended messages for now */
- if (s->cmdfifo_cdb_offset) {
- fifo8_pop_buf(&s->cmdfifo, s->cmdfifo_cdb_offset, &n);
- s->cmdfifo_cdb_offset = 0;
- }
+ if (s->cmdfifo_cdb_offset) {
+ s->cmdfifo_cdb_offset--;
+
+ /* Ignore extended messages for now */
+ if (s->cmdfifo_cdb_offset) {
+ fifo8_pop_buf(&s->cmdfifo, s->cmdfifo_cdb_offset, &n);
+ s->cmdfifo_cdb_offset = 0;
+ }
+ }
- do_busid_cmd(s, busid);
+ do_busid_cmd(s, busid);
+ }
}
static void satn_pdma_cb(ESPState *s)
--
2.20.1
- [PATCH v2 0/6] esp: fix asserts/segfaults discovered by fuzzer, Mark Cave-Ayland, 2021/03/17
- [PATCH v2 1/6] esp: don't underflow cmdfifo if no message out/command data is present,
Mark Cave-Ayland <=
- [PATCH v2 2/6] esp: don't overflow cmdfifo if TC is larger than the cmdfifo size, Mark Cave-Ayland, 2021/03/17
- [PATCH v2 3/6] esp: ensure cmdfifo is not empty and current_dev is non-NULL, Mark Cave-Ayland, 2021/03/17
- [PATCH v2 4/6] esp: don't underflow fifo when writing to the device, Mark Cave-Ayland, 2021/03/17
- [PATCH v2 5/6] esp: always check current_req is not NULL before use in DMA callbacks, Mark Cave-Ayland, 2021/03/17
- [PATCH v2 6/6] tests/qtest: add tests for am53c974 device, Mark Cave-Ayland, 2021/03/17