From: Qiang Liu <cyruscyliu@gmail.com>
To: qemu-devel@nongnu.org
Cc: Qiang Liu <cyruscyliu@gmail.com>,
Vikram Garhwal <vikram.garhwal@amd.com>,
Francisco Iglesias <francisco.iglesias@amd.com>,
Pavel Pisa <pisa@cmp.felk.cvut.cz>,
Jason Wang <jasowang@redhat.com>
Subject: [PATCH] hw/net/can/xlnx-zynqmp-can: fix assertion failures in transfer_fifo()
Date: Mon, 9 Jan 2023 17:19:50 +0800 [thread overview]
Message-ID: <20230109091950.784235-1-cyruscyliu@gmail.com> (raw)
Check fifos before poping data from and pushing data into it.
Fixes: 98e5d7a2b726 ("hw/net/can: Introduce Xilinx ZynqMP CAN controller")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1425
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1427
Reported-by: Qiang Liu <cyruscyliu@gmail.com>
Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>
---
hw/net/can/xlnx-zynqmp-can.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c
index e93e6c5e19..55d3221b49 100644
--- a/hw/net/can/xlnx-zynqmp-can.c
+++ b/hw/net/can/xlnx-zynqmp-can.c
@@ -451,6 +451,12 @@ static void transfer_fifo(XlnxZynqMPCANState *s, Fifo32 *fifo)
}
while (!fifo32_is_empty(fifo)) {
+ if (fifo32_num_used(fifo) < (4 * CAN_FRAME_SIZE)) {
+ g_autofree char *path = object_get_canonical_path(OBJECT(s));
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: data left in the fifo is not"
+ " enough for transfer.\n", path);
+ break;
+ }
for (i = 0; i < CAN_FRAME_SIZE; i++) {
data[i] = fifo32_pop(fifo);
}
@@ -463,7 +469,8 @@ static void transfer_fifo(XlnxZynqMPCANState *s, Fifo32 *fifo)
* acknowledged. The XlnxZynqMPCAN core receives any message
* that it transmits.
*/
- if (fifo32_is_full(&s->rx_fifo)) {
+ if (fifo32_is_full(&s->rx_fifo) ||
+ (fifo32_num_free(&s->rx_fifo) < (4 * CAN_FRAME_SIZE))) {
ARRAY_FIELD_DP32(s->regs, INTERRUPT_STATUS_REGISTER, RXOFLW, 1);
} else {
for (i = 0; i < CAN_FRAME_SIZE; i++) {
--
2.25.1
next reply other threads:[~2023-01-09 10:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-09 9:19 Qiang Liu [this message]
2023-01-19 8:23 ` [PATCH] hw/net/can/xlnx-zynqmp-can: fix assertion failures in transfer_fifo() Jason Wang
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=20230109091950.784235-1-cyruscyliu@gmail.com \
--to=cyruscyliu@gmail.com \
--cc=francisco.iglesias@amd.com \
--cc=jasowang@redhat.com \
--cc=pisa@cmp.felk.cvut.cz \
--cc=qemu-devel@nongnu.org \
--cc=vikram.garhwal@amd.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).