From: "Cédric Le Goater" <clg@kaod.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "Andrew Jeffery" <andrew@aj.id.au>,
"Cédric Le Goater" <clg@kaod.org>,
qemu-arm@nongnu.org, "Joel Stanley" <joel@jms.id.au>,
qemu-devel@nongnu.org
Subject: [PATCH 3/5] ftgmac100: check RX and TX buffer alignment
Date: Tue, 7 Jan 2020 08:34:21 +0100 [thread overview]
Message-ID: <20200107073423.30043-4-clg@kaod.org> (raw)
In-Reply-To: <20200107073423.30043-1-clg@kaod.org>
These buffers should be aligned on 16 bytes.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/net/ftgmac100.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
index 86ac25894a89..051f7b7af2d6 100644
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -198,6 +198,8 @@ typedef struct {
uint32_t des3;
} FTGMAC100Desc;
+#define FTGMAC100_DESC_ALIGNMENT 16
+
/*
* Specific RTL8211E MII Registers
*/
@@ -722,6 +724,12 @@ static void ftgmac100_write(void *opaque, hwaddr addr,
s->itc = value;
break;
case FTGMAC100_RXR_BADR: /* Ring buffer address */
+ if (!QEMU_IS_ALIGNED(value, FTGMAC100_DESC_ALIGNMENT)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad RX buffer alignment 0x%"
+ HWADDR_PRIx "\n", __func__, value);
+ return;
+ }
+
s->rx_ring = value;
s->rx_descriptor = s->rx_ring;
break;
@@ -731,6 +739,11 @@ static void ftgmac100_write(void *opaque, hwaddr addr,
break;
case FTGMAC100_NPTXR_BADR: /* Transmit buffer address */
+ if (!QEMU_IS_ALIGNED(value, FTGMAC100_DESC_ALIGNMENT)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad TX buffer alignment 0x%"
+ HWADDR_PRIx "\n", __func__, value);
+ return;
+ }
s->tx_ring = value;
s->tx_descriptor = s->tx_ring;
break;
--
2.21.1
next prev parent reply other threads:[~2020-01-07 7:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 7:34 [PATCH 0/5] aspeed: extensions and fixes Cédric Le Goater
2020-01-07 7:34 ` [PATCH 1/5] hw/sd: Configure number of slots exposed by the ASPEED SDHCI model Cédric Le Goater
2020-01-07 7:34 ` [PATCH 2/5] hw/arm: ast2600: Wire up the eMMC controller Cédric Le Goater
2020-01-07 8:25 ` Philippe Mathieu-Daudé
2020-01-10 10:07 ` Cédric Le Goater
2020-01-10 11:56 ` Cédric Le Goater
2020-01-12 23:20 ` Andrew Jeffery
2020-01-07 7:34 ` Cédric Le Goater [this message]
2020-01-07 8:27 ` [PATCH 3/5] ftgmac100: check RX and TX buffer alignment Philippe Mathieu-Daudé
2020-01-07 8:36 ` Cédric Le Goater
2020-01-10 10:24 ` Philippe Mathieu-Daudé
2020-01-07 7:34 ` [PATCH 4/5] hw/arm/aspeed: add a 'execute-in-place' property to boot directly from CE0 Cédric Le Goater
2020-01-07 8:34 ` Philippe Mathieu-Daudé
2020-01-10 10:14 ` Cédric Le Goater
2020-01-07 7:34 ` [PATCH 5/5] misc/pca9552: Add qom set and get Cédric Le Goater
2020-01-13 7:44 ` [PATCH 0/5] aspeed: extensions and fixes Cédric Le Goater
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=20200107073423.30043-4-clg@kaod.org \
--to=clg@kaod.org \
--cc=andrew@aj.id.au \
--cc=joel@jms.id.au \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.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 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).