Patchwork [2.6.29.1,1/1] 8139too: fix HW initial flow

login
register
mail settings
Submitter jon.lin@vatics.com
Date April 20, 2009, 12:58 p.m.
Message ID <0E04AEADD178614A86F3017CC5FA693B4959924809@MS.vivotek.tw>
Download mbox | patch
Permalink /patch/26190/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

jon.lin@vatics.com - April 20, 2009, 12:58 p.m.
From: Jonathan Lin <jon.lin@vatics.com>


While ifconfig eth0 up kernel calls open() of 8139 driver(8139too.c).
In rtl8139_hw_start() of rtl8139_open(), 8139 driver enable RX before setting up the DMA buffer address. In this interval where RX was enabled and DMA buffer address is not yet set up, any incoming broadcast packet would be send to a strange physical address:
0x003e8800 which is the default value of DMA buffer address.
Unfortunately, this address is used by Linux kernel. So kernel panics.
This patch fix it by setting up DMA buffer address before RX enabled and everything is fine even under broadcast packets attack.

Signed-off-by: Jonathan Lin <jon.lin@vatics.com>
Jianjun kong - April 20, 2009, 1:28 p.m.
On Mon, Apr 20, 2009 at 08:58:01PM +0800, jon.lin@vatics.com wrote:
>From: Jonathan Lin <jon.lin@vatics.com>
>
>While ifconfig eth0 up kernel calls open() of 8139 driver(8139too.c).
>In rtl8139_hw_start() of rtl8139_open(), 8139 driver enable RX before setting up the DMA buffer address. In this interval where RX was enabled and DMA buffer address is not yet set up, any incoming broadcast packet would be send to a strange physical address:
>0x003e8800 which is the default value of DMA buffer address.
>Unfortunately, this address is used by Linux kernel. So kernel panics.
>This patch fix it by setting up DMA buffer address before RX enabled and everything is fine even under broadcast packets attack.
>
>Signed-off-by: Jonathan Lin <jon.lin@vatics.com>

Reviewed-by: Amos Kong <jianjun@zeuux.org>

>--- linux-2.6.29.1/drivers/net/8139too.c.orig   2009-04-19 17:50:38.000000000 +0800
>+++ linux-2.6.29.1/drivers/net/8139too.c        2009-04-19 17:52:51.000000000 +0800
>@@ -1382,6 +1382,10 @@ static void rtl8139_hw_start (struct net
>        RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
>        RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4)));
>
>+       tp->cur_rx = 0;
>+       /* init Rx ring buffer DMA address BEFORE Rx enabled*/
>+       RTL_W32_F (RxBuf, tp->rx_ring_dma);
>+
...
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - April 21, 2009, 8:52 a.m.
From: <jon.lin@vatics.com>
Date: Mon, 20 Apr 2009 20:58:01 +0800

> While ifconfig eth0 up kernel calls open() of 8139 driver(8139too.c).
> In rtl8139_hw_start() of rtl8139_open(), 8139 driver enable RX before setting up the DMA buffer address. In this interval where RX was enabled and DMA buffer address is not yet set up, any incoming broadcast packet would be send to a strange physical address:
> 0x003e8800 which is the default value of DMA buffer address.
> Unfortunately, this address is used by Linux kernel. So kernel panics.
> This patch fix it by setting up DMA buffer address before RX enabled and everything is fine even under broadcast packets attack.
> 
> Signed-off-by: Jonathan Lin <jon.lin@vatics.com>

This patch does not apply, it was corrupted by your email client.

I even think it has MS-DOS style newlines in it :-(
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- linux-2.6.29.1/drivers/net/8139too.c.orig   2009-04-19 17:50:38.000000000 +0800

+++ linux-2.6.29.1/drivers/net/8139too.c        2009-04-19 17:52:51.000000000 +0800

@@ -1382,6 +1382,10 @@  static void rtl8139_hw_start (struct net

        RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
        RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4)));

+       tp->cur_rx = 0;

+       /* init Rx ring buffer DMA address BEFORE Rx enabled*/

+       RTL_W32_F (RxBuf, tp->rx_ring_dma);

+

        /* Must enable Tx/Rx before setting transfer thresholds! */
        RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);

@@ -1389,8 +1393,6 @@  static void rtl8139_hw_start (struct net

        RTL_W32 (RxConfig, tp->rx_config);
        RTL_W32 (TxConfig, rtl8139_tx_config);

-       tp->cur_rx = 0;

-

        rtl_check_media (dev, 1);

        if (tp->chipset >= CH_8139B) {
@@ -1405,9 +1407,6 @@  static void rtl8139_hw_start (struct net

        /* Lock Config[01234] and BMCR register writes */
        RTL_W8 (Cfg9346, Cfg9346_Lock);

-       /* init Rx ring buffer DMA address */

-       RTL_W32_F (RxBuf, tp->rx_ring_dma);

-

        /* init Tx buffer DMA addresses */
        for (i = 0; i < NUM_TX_DESC; i++)
                RTL_W32_F (TxAddr0 + (i * 4), tp->tx_bufs_dma + (tp->tx_buf[i] - tp->tx_bufs));