diff mbox

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

Message ID 20090421094825.GA6752@ubuntu
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Jianjun kong April 21, 2009, 9:48 a.m. UTC
...
>> 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 :-(

Another new patch :)


 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>
Signed-off-by: Amos Kong <jianjun@zeuux.org>

---
 drivers/net/8139too.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Comments

Eric Dumazet April 21, 2009, 10:30 a.m. UTC | #1
Amos Kong a écrit :
> ...
>>> 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 :-(
> 
> Another new patch :)
> 
> 
>  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>
> Signed-off-by: Amos Kong <jianjun@zeuux.org>

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>

Thanks Amos and Jonathan

> 
> ---
>  drivers/net/8139too.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
> index 29df398..1fc4543 100644
> --- a/drivers/net/8139too.c
> +++ b/drivers/net/8139too.c
> @@ -1383,6 +1383,11 @@ static void rtl8139_hw_start (struct net_device *dev)
>  	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 */
> +	RTL_W32_F (RxBuf, tp->rx_ring_dma);
> +
>  	/* Must enable Tx/Rx before setting transfer thresholds! */
>  	RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
>  
> @@ -1390,8 +1395,6 @@ static void rtl8139_hw_start (struct net_device *dev)
>  	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) {
> @@ -1406,9 +1409,6 @@ static void rtl8139_hw_start (struct net_device *dev)
>  	/* 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));


--
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
Eric Dumazet April 21, 2009, 10:34 a.m. UTC | #2
jon.lin@vatics.com a e'crit :
> Dear Sirs,
> 
> I am so sorry for my clumsiness!
> It is so embarrassed that I can't submit a valid patch...
> Thank you all for your incredible patience.
> I will try to use mail command in my Linux box to submit it again.
> Sorry for these stupid failures.
> 
> Regards
>   Jonathan

It happens :(

Next time you want to try, just send your patch to someone
(this could be you or me) that can check patch before you re-submit it to
the lists, this can avoid many iterations.

You did the hard work, finding and fixing the bug, dont forget 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
David Miller April 22, 2009, 7:44 a.m. UTC | #3
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Tue, 21 Apr 2009 12:30:24 +0200

> Amos Kong a écrit :
>> ...
>>  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>
>> Signed-off-by: Amos Kong <jianjun@zeuux.org>
> 
> Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
> 
> Thanks Amos and Jonathan

Applied, thanks everyone.
--
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
diff mbox

Patch

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 29df398..1fc4543 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -1383,6 +1383,11 @@  static void rtl8139_hw_start (struct net_device *dev)
 	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 */
+	RTL_W32_F (RxBuf, tp->rx_ring_dma);
+
 	/* Must enable Tx/Rx before setting transfer thresholds! */
 	RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
 
@@ -1390,8 +1395,6 @@  static void rtl8139_hw_start (struct net_device *dev)
 	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) {
@@ -1406,9 +1409,6 @@  static void rtl8139_hw_start (struct net_device *dev)
 	/* 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));