[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1342821035.5434.60.camel@lorien2>
Date: Fri, 20 Jul 2012 15:50:35 -0600
From: Shuah Khan <shuah.khan@...com>
To: davem@...emloft.net, mcarlson@...adcom.com,
bhutchings@...arflare.com, eric.dumazet@...il.com,
mchan@...adcom.com
Cc: netdev@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
shuahkhan@...il.com, stable@...r.kernel.org
Subject: [PATCH RFT RESEND] net: Fix Neptune ethernet driver to check dma
mapping error
Fix Neptune ethernet driver to check dma mapping error after map_page()
interface returns.
Signed-off-by: Shuah Khan <shuah.khan@...com>
---
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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists