From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 07/13] esp: ensure cmdfifo is not empty and current_dev is non-NULL
Date: Mon, 12 Apr 2021 23:20:42 +0100 [thread overview]
Message-ID: <20210412222048.22818-8-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20210412222048.22818-1-mark.cave-ayland@ilande.co.uk>
When about to execute a SCSI command, ensure that cmdfifo is not empty and
current_dev is non-NULL. This can happen if the guest tries to execute a TI
(Transfer Information) command without issuing one of the select commands
first.
Buglink: https://bugs.launchpad.net/qemu/+bug/1910723
Buglink: https://bugs.launchpad.net/qemu/+bug/1909247
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20210407195801.685-7-mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index bf22785b79..904fa3179c 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -284,6 +284,9 @@ static void do_busid_cmd(ESPState *s, uint8_t busid)
trace_esp_do_busid_cmd(busid);
lun = busid & 7;
cmdlen = fifo8_num_used(&s->cmdfifo);
+ if (!cmdlen || !s->current_dev) {
+ return;
+ }
esp_fifo_pop_buf(&s->cmdfifo, buf, cmdlen);
current_lun = scsi_device_find(&s->bus, 0, s->current_dev->id, lun);
--
2.20.1
next prev parent reply other threads:[~2021-04-12 22:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 22:20 [PULL 00/13] qemu-sparc queue 20210412 Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 01/13] esp: fix setting of ESPState mig_version_id when launching QEMU with -S option Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 02/13] esp: always check current_req is not NULL before use in DMA callbacks Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 03/13] esp: rework write_response() to avoid using the FIFO for DMA transactions Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 04/13] esp: consolidate esp_cmdfifo_push() into esp_fifo_push() Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 05/13] esp: consolidate esp_cmdfifo_pop() into esp_fifo_pop() Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 06/13] esp: introduce esp_fifo_pop_buf() and use it instead of fifo8_pop_buf() Mark Cave-Ayland
2021-04-12 22:20 ` Mark Cave-Ayland [this message]
2021-04-12 22:20 ` [PULL 08/13] esp: don't underflow cmdfifo in do_cmd() Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 09/13] esp: don't overflow cmdfifo in get_cmd() Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 10/13] esp: don't overflow cmdfifo if TC is larger than the cmdfifo size Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 11/13] esp: don't reset async_len directly in esp_select() if cancelling request Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 12/13] esp: ensure that do_cmd is set to zero before submitting an ESP select command Mark Cave-Ayland
2021-04-12 22:20 ` [PULL 13/13] tests/qtest: add tests for am53c974 device Mark Cave-Ayland
2021-04-13 12:04 ` [PULL 00/13] qemu-sparc queue 20210412 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210412222048.22818-8-mark.cave-ayland@ilande.co.uk \
--to=mark.cave-ayland@ilande.co.uk \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.