summaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-10-09 10:57:20 -0400
committerDavid S. Miller <davem@davemloft.net>2018-10-11 01:38:50 -0400
commit1d9d8be91788416d17862ec5a30fff33281ddef6 (patch)
treee4a8df6c0f0097564009d27f8d684b79f4dee589 /drivers/atm
parent0e21b2258a0f8ab5537387b3f1a43b672ce62670 (diff)
fore200e: check for dma mapping failures
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/fore200e.c13
1 files changed, 13 insertions, 0 deletions
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
195 195
196 chunk->dma_addr = dma_map_single(fore200e->dev, chunk->align_addr, 196 chunk->dma_addr = dma_map_single(fore200e->dev, chunk->align_addr,
197 size, direction); 197 size, direction);
198 if (dma_mapping_error(fore200e->dev, chunk->dma_addr)) {
199 kfree(chunk->alloc_addr);
200 return -ENOMEM;
201 }
198 return 0; 202 return 0;
199} 203}
200 204
@@ -576,6 +580,8 @@ fore200e_pca_prom_read(struct fore200e* fore200e, struct prom_data* prom)
576 580
577 prom_dma = dma_map_single(fore200e->dev, prom, sizeof(struct prom_data), 581 prom_dma = dma_map_single(fore200e->dev, prom, sizeof(struct prom_data),
578 DMA_FROM_DEVICE); 582 DMA_FROM_DEVICE);
583 if (dma_mapping_error(fore200e->dev, prom_dma))
584 return -ENOMEM;
579 585
580 fore200e->bus->write(prom_dma, &entry->cp_entry->cmd.prom_block.prom_haddr); 586 fore200e->bus->write(prom_dma, &entry->cp_entry->cmd.prom_block.prom_haddr);
581 587
@@ -1597,6 +1603,11 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
1597 tpd = entry->tpd; 1603 tpd = entry->tpd;
1598 tpd->tsd[ 0 ].buffer = dma_map_single(fore200e->dev, data, tx_len, 1604 tpd->tsd[ 0 ].buffer = dma_map_single(fore200e->dev, data, tx_len,
1599 DMA_TO_DEVICE); 1605 DMA_TO_DEVICE);
1606 if (dma_mapping_error(fore200e->dev, tpd->tsd[0].buffer)) {
1607 if (tx_copy)
1608 kfree(data);
1609 return -ENOMEM;
1610 }
1600 tpd->tsd[ 0 ].length = tx_len; 1611 tpd->tsd[ 0 ].length = tx_len;
1601 1612
1602 FORE200E_NEXT_ENTRY(txq->head, QUEUE_SIZE_TX); 1613 FORE200E_NEXT_ENTRY(txq->head, QUEUE_SIZE_TX);
@@ -1671,6 +1682,8 @@ fore200e_getstats(struct fore200e* fore200e)
1671 1682
1672 stats_dma_addr = dma_map_single(fore200e->dev, fore200e->stats, 1683 stats_dma_addr = dma_map_single(fore200e->dev, fore200e->stats,
1673 sizeof(struct stats), DMA_FROM_DEVICE); 1684 sizeof(struct stats), DMA_FROM_DEVICE);
1685 if (dma_mapping_error(fore200e->dev, stats_dma_addr))
1686 return -ENOMEM;
1674 1687
1675 FORE200E_NEXT_ENTRY(cmdq->head, QUEUE_SIZE_CMD); 1688 FORE200E_NEXT_ENTRY(cmdq->head, QUEUE_SIZE_CMD);
1676 1689