From: Christoph Hellwig <hch@lst.de>
To: Chas Williams <3chas3@gmail.com>, netdev@vger.kernel.org
Cc: linux-atm-general@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: [PATCH 7/7] fore200e: check for dma mapping failures
Date: Tue, 9 Oct 2018 16:57:20 +0200 [thread overview]
Message-ID: <20181009145720.32578-8-hch@lst.de> (raw)
In-Reply-To: <20181009145720.32578-1-hch@lst.de>
The driver was lacking any handling for failures from the DMA mapping
routines. With an iommu or swiotlb this can be fatal.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/atm/fore200e.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 7eda1a8c3d8c..2b5dc8fe1d85 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -195,6 +195,10 @@ fore200e_chunk_alloc(struct fore200e* fore200e, struct chunk* chunk, int size, i
chunk->dma_addr = dma_map_single(fore200e->dev, chunk->align_addr,
size, direction);
+ if (dma_mapping_error(fore200e->dev, chunk->dma_addr)) {
+ kfree(chunk->alloc_addr);
+ return -ENOMEM;
+ }
return 0;
}
@@ -576,6 +580,8 @@ fore200e_pca_prom_read(struct fore200e* fore200e, struct prom_data* prom)
prom_dma = dma_map_single(fore200e->dev, prom, sizeof(struct prom_data),
DMA_FROM_DEVICE);
+ if (dma_mapping_error(fore200e->dev, prom_dma))
+ return -ENOMEM;
fore200e->bus->write(prom_dma, &entry->cp_entry->cmd.prom_block.prom_haddr);
@@ -1597,6 +1603,11 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
tpd = entry->tpd;
tpd->tsd[ 0 ].buffer = dma_map_single(fore200e->dev, data, tx_len,
DMA_TO_DEVICE);
+ if (dma_mapping_error(fore200e->dev, tpd->tsd[0].buffer)) {
+ if (tx_copy)
+ kfree(data);
+ return -ENOMEM;
+ }
tpd->tsd[ 0 ].length = tx_len;
FORE200E_NEXT_ENTRY(txq->head, QUEUE_SIZE_TX);
@@ -1671,6 +1682,8 @@ fore200e_getstats(struct fore200e* fore200e)
stats_dma_addr = dma_map_single(fore200e->dev, fore200e->stats,
sizeof(struct stats), DMA_FROM_DEVICE);
+ if (dma_mapping_error(fore200e->dev, stats_dma_addr))
+ return -ENOMEM;
FORE200E_NEXT_ENTRY(cmdq->head, QUEUE_SIZE_CMD);
--
2.19.0
next prev parent reply other threads:[~2018-10-09 14:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-09 14:57 fore200e DMA cleanups and fixes Christoph Hellwig
2018-10-09 14:57 ` [PATCH 1/7] fore200e: simplify fore200e_bus usage Christoph Hellwig
2018-10-09 14:57 ` [PATCH 2/7] fore200e: store a struct device in struct fore200e Christoph Hellwig
2018-10-09 14:57 ` [PATCH 3/7] fore200e: remove the align_size field of struct chunk Christoph Hellwig
2018-10-09 14:57 ` [PATCH 4/7] fore200e: devirtualize dma mapping calls Christoph Hellwig
2018-10-09 14:57 ` [PATCH 5/7] fore200e: devirtualize dma alloc calls Christoph Hellwig
2018-10-09 14:57 ` [PATCH 6/7] fore200e: don't use GFP_DMA Christoph Hellwig
2018-10-09 14:57 ` Christoph Hellwig [this message]
2018-10-11 5:39 ` fore200e DMA cleanups and fixes David Miller
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=20181009145720.32578-8-hch@lst.de \
--to=hch@lst.de \
--cc=3chas3@gmail.com \
--cc=linux-atm-general@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.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
all inboxes | Powered by JetHome®