From: Alexandra Diupina <adiupina@astralinux.ru>
To: Alistair Francis <alistair@alistair23.me>
Cc: Alexandra Diupina <adiupina@astralinux.ru>,
"Konrad, Frederic" <Frederic.Konrad@amd.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org,
sdl.qemu@linuxtesting.org
Subject: [PATCH v2 RFC] fix host-endianness bug and prevent overflow
Date: Wed, 24 Apr 2024 15:53:24 +0300 [thread overview]
Message-ID: <20240424125324.1628-1-adiupina@astralinux.ru> (raw)
In-Reply-To: <CAFEAcA9JXOxkbQP6-1uTK+hG5yvYRcO31PYFZSxGjfrPis1nYA@mail.gmail.com>
Add a type cast and use extract64() instead of extract32()
to avoid integer overflow on addition. Fix bit fields
extraction according to documentation.
Also fix host-endianness bug by swapping desc fields from guest
memory order to host memory order after dma_memory_read().
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: d3c6369a96 ("introduce xlnx-dpdma")
Signed-off-by: Alexandra Diupina <adiupina@astralinux.ru>
---
hw/dma/xlnx_dpdma.c | 38 ++++++++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c
index dd66be5265..d22b942274 100644
--- a/hw/dma/xlnx_dpdma.c
+++ b/hw/dma/xlnx_dpdma.c
@@ -175,24 +175,24 @@ static uint64_t xlnx_dpdma_desc_get_source_address(DPDMADescriptor *desc,
switch (frag) {
case 0:
- addr = desc->source_address
- + (extract32(desc->address_extension, 16, 12) << 20);
+ addr = (uint64_t)desc->source_address
+ + (extract64(desc->address_extension, 16, 16) << 32);
break;
case 1:
- addr = desc->source_address2
- + (extract32(desc->address_extension_23, 0, 12) << 8);
+ addr = (uint64_t)desc->source_address2
+ + (extract64(desc->address_extension_23, 0, 16) << 32);
break;
case 2:
- addr = desc->source_address3
- + (extract32(desc->address_extension_23, 16, 12) << 20);
+ addr = (uint64_t)desc->source_address3
+ + (extract64(desc->address_extension_23, 16, 16) << 32);
break;
case 3:
- addr = desc->source_address4
- + (extract32(desc->address_extension_45, 0, 12) << 8);
+ addr = (uint64_t)desc->source_address4
+ + (extract64(desc->address_extension_45, 0, 16) << 32);
break;
case 4:
- addr = desc->source_address5
- + (extract32(desc->address_extension_45, 16, 12) << 20);
+ addr = (uint64_t)desc->source_address5
+ + (extract64(desc->address_extension_45, 16, 16) << 32);
break;
default:
addr = 0;
@@ -660,6 +660,24 @@ size_t xlnx_dpdma_start_operation(XlnxDPDMAState *s, uint8_t channel,
break;
}
+ /* Convert from LE into host endianness. */
+ desc.control = le32_to_cpu(desc.control);
+ desc.descriptor_id = le32_to_cpu(desc.descriptor_id);
+ desc.xfer_size = le32_to_cpu(desc.xfer_size);
+ desc.line_size_stride = le32_to_cpu(desc.line_size_stride);
+ desc.timestamp_lsb = le32_to_cpu(desc.timestamp_lsb);
+ desc.timestamp_msb = le32_to_cpu(desc.timestamp_msb);
+ desc.address_extension = le32_to_cpu(desc.address_extension);
+ desc.next_descriptor = le32_to_cpu(desc.next_descriptor);
+ desc.source_address = le32_to_cpu(desc.source_address);
+ desc.address_extension_23 = le32_to_cpu(desc.address_extension_23);
+ desc.address_extension_45 = le32_to_cpu(desc.address_extension_45);
+ desc.source_address2 = le32_to_cpu(desc.source_address2);
+ desc.source_address3 = le32_to_cpu(desc.source_address3);
+ desc.source_address4 = le32_to_cpu(desc.source_address4);
+ desc.source_address5 = le32_to_cpu(desc.source_address5);
+ desc.crc = le32_to_cpu(desc.crc);
+
xlnx_dpdma_update_desc_info(s, channel, &desc);
#ifdef DEBUG_DPDMA
--
2.30.2
next prev parent reply other threads:[~2024-04-24 12:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-12 8:13 [PATCH RFC] prevent overflow in xlnx_dpdma_desc_get_source_address() Alexandra Diupina
2024-04-12 10:06 ` Peter Maydell
2024-04-16 17:56 ` Alexandra Diupina
2024-04-16 18:30 ` Edgar E. Iglesias
2024-04-17 10:05 ` Konrad, Frederic
2024-04-23 10:23 ` Alexandra Diupina
2024-04-23 10:51 ` Peter Maydell
2024-04-24 12:53 ` Alexandra Diupina [this message]
2024-04-24 16:04 ` [PATCH v2 RFC] fix host-endianness bug and prevent overflow Peter Maydell
2024-04-24 18:13 ` [PATCH] fix host-endianness bug Alexandra Diupina
2024-04-25 9:26 ` Peter Maydell
2024-04-25 10:07 ` [PATCH v2] " Alexandra Diupina
2024-04-25 10:42 ` Philippe Mathieu-Daudé
2024-04-25 13:41 ` [PATCH v3] fix endianness bug Alexandra Diupina
2024-04-25 15:24 ` Richard Henderson
2024-04-24 18:13 ` [PATCH] fix bit fields extraction and prevent overflow Alexandra Diupina
2024-04-25 19:25 ` 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=20240424125324.1628-1-adiupina@astralinux.ru \
--to=adiupina@astralinux.ru \
--cc=Frederic.Konrad@amd.com \
--cc=alistair@alistair23.me \
--cc=edgar.iglesias@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sdl.qemu@linuxtesting.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.