2009-04-19 10:16:30

by Tzungder Lin

[permalink] [raw]
Subject: [PATCH 2.6.29.1 1/1] 8139too: fix HW initial flow

From: Jonathan Lin <[email protected], [email protected]>

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 <[email protected], [email protected]>

---

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


2009-04-19 11:22:32

by Eric Dumazet

[permalink] [raw]
Subject: Re: [PATCH 2.6.29.1 1/1] 8139too: fix HW initial flow

Tzungder Lin a ?crit :
> From: Jonathan Lin <[email protected], [email protected]>
>
> 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 <[email protected], [email protected]>
>
> ---
>
> --- 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));
> --

Hi Jonathan

There are at least two small problems on this patch submission.

1) Please chose one of email address for Signoff line, not two :)

For example : Signed-off-by: Jonathan Lin <[email protected]>

You'll be soon flooded by spams, so dont ease spamers life :)

2) Try to find out why your email got two lines wrapped
You can read Documentation/email-clients.txt if you want extensive documentation.
You can also test this by sending your 'patch' to yourself and check if
no lines were wrapped before sending the 'official patch'

I dont want to bother you Jonathan, as it is pretty hard for a newcomer to learn
this things, but I feel that you might find other bugs in linux kernel, so this
learning is likely a good investment, both for you and others.

Thanks

2009-04-20 01:54:25

by Tzungder Lin

[permalink] [raw]
Subject: [PATCH 2.6.29.1 1/1] 8139too: fix HW initial flow

From: Jonathan Lin <[email protected]>

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 <[email protected]>

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

2009-04-20 10:15:05

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 2.6.29.1 1/1] 8139too: fix HW initial flow

From: Tzungder Lin <[email protected]>
Date: Mon, 20 Apr 2009 09:54:10 +0800

> From: Jonathan Lin <[email protected]>
>
> 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 <[email protected]>

Your email client corrupted this patch, breaking up long lines
and substituting tabs with space characters among other things.

Please fix this up and resubmit.

I would suggest trying to send the patch to yourself and then trying
to apply what arrives in your inbox, just as I would.

Thanks.