Commit:     4c537e6371a9510c82eb96fb7e1e66017e0e2053
Parent:     0581d3f53053de597ef4956568c15785e59828ef
Author:     Jon Smirl <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 3 22:38:10 2007 +0000
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Tue Dec 4 14:53:14 2007 -0500

    Fix memory corruption in fec_mpc52xx
    The mpc5200 fec driver is corrupting memory. This patch fixes two bugs
    where the wrong skb was being referenced.
    Signed-off-by: Jon Smirl <[EMAIL PROTECTED]>
    Acked-by: Domen Puncer <[EMAIL PROTECTED]>
    Signed-off-by: Grant Likely <[EMAIL PROTECTED]>
    Signed-off-by: David Woodhouse <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 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 bf5a7ca..79f7ead 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 
                rskb = bcom_retrieve_buffer(priv->rx_dmatsk, &status,
                                (struct bcom_bd **)&bd);
-               dma_unmap_single(&dev->dev, bd->skb_pa, skb->len, 
+               dma_unmap_single(&dev->dev, bd->skb_pa, rskb->len, 
                /* 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 
                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 git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to