From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 2/3] net: fec: Bail out if DMA address is larger than 32-bits
Date: Thu, 23 Aug 2018 20:05:10 -0700 [thread overview]
Message-ID: <20180824030511.23021-3-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180824030511.23021-1-andrew.smirnov@gmail.com>
On 64-bit SoCs it becomes possible to end up with a DMA buffer
allocated in the region of memory inaccessible to FEC
controller. Change the code to bail out if that happens to avoid
silent failures that'd result otherwise.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/net/fec_imx.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 98711baa7..a61fd8294 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -484,6 +484,9 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length)
if (dma_mapping_error(fec->dev, dma))
return -EIO;
+ if (dma > U32_MAX)
+ return -EFAULT;
+
writel((uint32_t)(dma), &fec->tbd_base[fec->tbd_index].data_pointer);
/*
@@ -612,7 +615,12 @@ static int fec_alloc_receive_packets(struct fec_priv *fec, int count, int size)
return -ENOMEM;
for (i = 0; i < count; i++) {
- writel(virt_to_phys(p), &fec->rbd_base[i].data_pointer);
+ unsigned long addr = virt_to_phys(p);
+
+ if (addr > U32_MAX)
+ return -EFAULT;
+
+ writel(addr, &fec->rbd_base[i].data_pointer);
p += size;
}
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-08-24 3:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-24 3:05 [PATCH 0/3] i.MX8 malloc pool position and 32-bit only DMA Andrey Smirnov
2018-08-24 3:05 ` [PATCH 1/3] mci: imx-esdhc: Bail out if DMA address is larger than 32-bits Andrey Smirnov
2018-08-27 6:53 ` Sascha Hauer
2018-08-27 23:33 ` Andrey Smirnov
2018-08-24 3:05 ` Andrey Smirnov [this message]
2018-08-24 3:05 ` [PATCH 3/3] ARM: start: Place malloc pool within 32-bit address space Andrey Smirnov
2018-08-27 9:06 ` Sascha Hauer
2018-08-27 23:38 ` Andrey Smirnov
2018-08-24 17:15 ` [PATCH 0/3] i.MX8 malloc pool position and 32-bit only DMA Sam Ravnborg
2018-08-27 23:32 ` Andrey Smirnov
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=20180824030511.23021-3-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.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