[PATCH RFT RESEND] net: Fix Neptune ethernet driver to check dma mapping error

Subsystems: networking drivers, the rest

STALE5162d

2 messages, 2 authors, 2012-07-23 · open the first message on its own page

[PATCH RFT RESEND] net: Fix Neptune ethernet driver to check dma mapping error

From: Shuah Khan <hidden>
Date: 2012-07-20 21:50:39

Fix Neptune ethernet driver to check dma mapping error after map_page()
interface returns.

Signed-off-by: Shuah Khan <redacted>
---
 drivers/net/ethernet/sun/niu.c |    4 ++++
 1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 8c726b7..60d5c03 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -3335,6 +3335,10 @@ static int niu_rbr_add_page(struct niu *np, struct rx_ring_info *rp,
 
 	addr = np->ops->map_page(np->device, page, 0,
 				 PAGE_SIZE, DMA_FROM_DEVICE);
+	if (!addr) {
+		__free_page(page);
+		return -ENOMEM;
+	}
 
 	niu_hash_page(rp, page, addr);
 	if (rp->rbr_blocks_per_page > 1)
-- 
1.7.9.5

Re: [PATCH RFT RESEND] net: Fix Neptune ethernet driver to check dma mapping error

From: David Miller <davem@davemloft.net>
Date: 2012-07-23 06:35:04

From: Shuah Khan <redacted>
Date: Fri, 20 Jul 2012 15:50:35 -0600
Fix Neptune ethernet driver to check dma mapping error after map_page()
interface returns.

Signed-off-by: Shuah Khan <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help