提交 c823abac 编写于 作者: F Florian Fainelli 提交者: David S. Miller

net: ep93xx_eth: Do not crash unloading module

When we unload the ep93xx_eth, whether we have opened the network
interface or not, we will either hit a kernel paging request error, or a
simple NULL pointer de-reference because:

- if ep93xx_open has been called, we have created a valid DMA mapping
  for ep->descs, when we call ep93xx_stop, we also call
  ep93xx_free_buffers, ep->descs now has a stale value

- if ep93xx_open has not been called, we have a NULL pointer for
  ep->descs, so performing any operation against that address just won't
  work

Fix this by adding a NULL pointer check for ep->descs which means that
ep93xx_free_buffers() was able to successfully tear down the descriptors
and free the DMA cookie as well.

Fixes: 1d22e05d ("[PATCH] Cirrus Logic ep93xx ethernet driver")
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 34e0f2c2
...@@ -468,6 +468,9 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep) ...@@ -468,6 +468,9 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep)
struct device *dev = ep->dev->dev.parent; struct device *dev = ep->dev->dev.parent;
int i; int i;
if (!ep->descs)
return;
for (i = 0; i < RX_QUEUE_ENTRIES; i++) { for (i = 0; i < RX_QUEUE_ENTRIES; i++) {
dma_addr_t d; dma_addr_t d;
...@@ -490,6 +493,7 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep) ...@@ -490,6 +493,7 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep)
dma_free_coherent(dev, sizeof(struct ep93xx_descs), ep->descs, dma_free_coherent(dev, sizeof(struct ep93xx_descs), ep->descs,
ep->descs_dma_addr); ep->descs_dma_addr);
ep->descs = NULL;
} }
static int ep93xx_alloc_buffers(struct ep93xx_priv *ep) static int ep93xx_alloc_buffers(struct ep93xx_priv *ep)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册