[<prev] [next>] [day] [month] [year] [list]
Message-id: <20071202055937.20940.38500.stgit@trillian.secretlab.ca>
Date: Sat, 01 Dec 2007 23:00:57 -0700
From: Grant Likely <grant.likely@...retlab.ca>
To: linuxppc-dev@...abs.org, netdev@...r.kernel.org,
jonsmirl@...il.com, jgarzik@...ox.com
Cc: domen.puncer@...argo.com, dwmw2@...radead.org
Subject: [PATCH] Fix buglets in mpc5200 FEC code that are corrupting memory.
From: Jon Smirl <jonsmirl@...il.com>
This is the reason I couldn't get user space started or connect to my
nfs server. Patch is against current linus git.
mpc5200 fec driver is corrupting memory. This patch fixes two bugs
where the wrong skb buffer was being referenced.
Signed-off-by: Jon Smirl <jonsmirl@...il.com>
Acked-by: Domen Puncer <domen.puncer@...argo.com>
Signed-off-by: Grant Likely <grant.likely@...retlab.ca>
---
Jeff, this one hasn't been picked up for 2.6.24 yet and in needs to go in.
Thanks,
g.
drivers/net/fec_mpc52xx.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index a8a0ee2..ddfcc0b 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -422,7 +422,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
rskb = bcom_retrieve_buffer(priv->rx_dmatsk, &status,
(struct bcom_bd **)&bd);
- dma_unmap_single(&dev->dev, bd->skb_pa, skb->len, DMA_FROM_DEVICE);
+ dma_unmap_single(&dev->dev, bd->skb_pa, rskb->len, DMA_FROM_DEVICE);
/* Test for errors in received frame */
if (status & BCOM_FEC_RX_BD_ERRORS) {
@@ -467,7 +467,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
bcom_prepare_next_buffer(priv->rx_dmatsk);
bd->status = FEC_RX_BUFFER_SIZE;
- bd->skb_pa = dma_map_single(&dev->dev, rskb->data,
+ bd->skb_pa = dma_map_single(&dev->dev, skb->data,
FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);
bcom_submit_next_buffer(priv->rx_dmatsk, skb);
--
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