[PATCH] Fix memory corruption in fec_mpc52xx

[PATCH] Fix memory corruption in fec_mpc52xx

[David Woodhouse]

From: Jon Smirl <jonsmirl@gmail.com>

The mpc5200 fec driver is corrupting memory. This patch fixes two bugs
where the wrong skb was being referenced.

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Acked-by: Domen Puncer <domen.puncer@telargo.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

--- 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);


-- 
dwmw2

Re: [PATCH] Fix memory corruption in fec_mpc52xx

[Jon Smirl]

On 12/3/07, David Woodhouse <dwmw2@infradead.org> wrote:
> From: Jon Smirl <jonsmirl@gmail.com>
>
> The mpc5200 fec driver is corrupting memory. This patch fixes two bugs
> where the wrong skb was being referenced.

What does it take to get this patch into the kernel? I've been posting
it since Nov 9.
It is an obvious bug. I can't even boot one of my boxes without it.

-- 
Jon Smirl
jonsmirl@gmail.com

Re: [PATCH] Fix memory corruption in fec_mpc52xx

[Jeff Garzik]

David Woodhouse wrote:
> From: Jon Smirl <jonsmirl@gmail.com>
> 
> The mpc5200 fec driver is corrupting memory. This patch fixes two bugs
> where the wrong skb was being referenced.
> 
> Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
> Acked-by: Domen Puncer <domen.puncer@telargo.com>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
> 
> --- 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);
> 

applied #upstream-fixes