[GIT]: Networking

[GIT]: Networking

[David Miller]

1) Remove bogus Kconfig default and fix bug in new sierra_net driver.
   From Elina Pasheva.

2) Fix powerpc OOPSer in e1000e, from Anton Blanchard.

3) FEC miscalculates register address in MAC address changing, writing
   to random memory, oops.  Fix from Mattias Walström.

4) p54pci doesn't use DMA API correctly, from Hans de Goede.

5) SOCK_DEBUG can miscompile, fix from Jan Engelhardt.

6) SCTP will skb_over_panic() when there are multiple parameter errors, fix
   from Neil Horman.

7) r8169_rx_interrupt() explodes when called from reset workqueue, fix from
   Eric Dumazet.

8) PPP input deref's two bytes before checking there are actually 2 bytes
   there in the linear packet area, furthermore ppp_read() isn't equipped
   to handle non-linear skbs.  Both fixes from Simon Arlott.

9) dm9601 writes wrong bits in DM_SHARED_CTRL register, resulting in
   severe degradation of performance (in some cases ~900Kb/s to
   ~30Kb/s).  Fix from Peter Korsgaard.

10) Add new Micrel PHY device driver, from David J. Choi.

11) ep93xx driver ACKs RX ring at the wrong spot, hanging chip.  Fix
    from Stefan Agner.

12) Default multicast hops socket setting is wrong as per RFC 3493.
    It should be '1' rather than the per-route unicast hop metric.
    Based upon a report by Elliot Hughes.

Please pull, thanks a lot!

The following changes since commit d93ac51c7a129db7a1431d859a3ef45a0b1f3fc5:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../sage/ceph-client

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Anton Blanchard (1):
      e1000e: Fix oops caused by ASPM patch.

David J. Choi (1):
      drivers/net/phy: micrel phy driver

David S. Miller (3):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      net: ep93xx_eth stops receiving packets
      ipv6: Fix default multicast hops setting.

Elina Pasheva (2):
      net/usb: remove default in Kconfig for sierra_net driver
      net/usb: initiate sync sequence in sierra_net.c driver

Eric Dumazet (1):
      r8169: Fix rtl8169_rx_interrupt()

Hans de Goede (1):
      p54pci: fix bugs in p54p_check_tx_ring

Jan Engelhardt (1):
      net: fix compile error due to double return type in SOCK_DEBUG

Mattias Walström (1):
      FEC: Fix kernel panic in fec_set_mac_address.

Neil Horman (1):
      sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)

Peter Korsgaard (1):
      dm9601: fix phy/eeprom write routine

Sebastian Siewior (1):
      net/sb1250: register mdio bus in probe

Simon Arlott (2):
      ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is valid
      ppp_generic: handle non-linear skbs when passing them to pppd

 drivers/net/arm/ep93xx_eth.c      |   10 ++--
 drivers/net/e1000e/netdev.c       |    3 +
 drivers/net/fec.c                 |    2 +-
 drivers/net/phy/Kconfig           |    5 ++
 drivers/net/phy/Makefile          |    1 +
 drivers/net/phy/micrel.c          |  104 +++++++++++++++++++++++++++++++++++++
 drivers/net/ppp_generic.c         |   34 ++++++++----
 drivers/net/r8169.c               |   22 ++++++--
 drivers/net/sb1250-mac.c          |   67 ++++++++++++------------
 drivers/net/usb/Kconfig           |    1 -
 drivers/net/usb/dm9601.c          |    2 +-
 drivers/net/usb/sierra_net.c      |    3 +
 drivers/net/wireless/p54/p54pci.c |    2 +-
 include/net/sctp/structs.h        |    1 +
 include/net/sock.h                |    2 +-
 net/ipv6/af_inet6.c               |    2 +-
 net/sctp/sm_make_chunk.c          |   62 ++++++++++++++++++++--
 17 files changed, 256 insertions(+), 67 deletions(-)
 create mode 100644 drivers/net/phy/micrel.c

tip: origin tree boot crash (in the new micrel phy driver)

[Ingo Molnar]

* David Miller <davem@davemloft.net> wrote:

>       drivers/net/phy: micrel phy driver

FYI, -tip testing started triggering this boot crash today (x86, 64-bit):

bus: 'mdio_bus': add driver STe101p
initcall ste10Xp_init+0x0/0x22 returned 0 after 52 usecs
calling  ksphy_init+0x0/0x5e @ 1
BUG: unable to handle kernel NULL pointer dereference at (null)
IP: [<ffffffff813b1e98>] strcmp+0x6/0x21
PGD 0
Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
last sysfs file:
CPU 1
Pid: 1, comm: swapper Not tainted 2.6.34-rc5 #3328 A8N-E/System Product
Name
RIP: 0010:[<ffffffff813b1e98>]  [<ffffffff813b1e98>] strcmp+0x6/0x21
RSP: 0018:ffff88003f33fe00  EFLAGS: 00010286
Call Trace:
 [<ffffffff813ae59d>] kset_find_obj+0x3d/0x81
 [<ffffffff814e664f>] driver_find+0x1f/0x32
 [<ffffffff814e6732>] driver_register+0x64/0x103
 [<ffffffff83ca853f>] ? ksphy_init+0x0/0x5e
 [<ffffffff816adcf1>] phy_driver_register+0x3e/0x92
 [<ffffffff83ca853f>] ? ksphy_init+0x0/0x5e
 [<ffffffff83ca8553>] ksphy_init+0x14/0x5e
 [<ffffffff810001f9>] do_one_initcall+0x5e/0x15e
 [<ffffffff83c706bb>] kernel_init+0x17d/0x206
 [<ffffffff81002f24>] kernel_thread_helper+0x4/0x10
 [<ffffffff81d8d450>] ? restore_args+0x0/0x30
 [<ffffffff83c7053e>] ? kernel_init+0x0/0x206
 [<ffffffff81002f20>] ? kernel_thread_helper+0x0/0x10
Code: c1 80 39 00 75 f8 eb 0d 48 ff c1 48 ff ca 75 05 c6 01 00 eb 0e 40 8a 3e 48 ff c6 40 84 ff 40 88 39 75 e5 c9 c3 55 48 89 e5 8a 07 <8a> 16 48 ff c7 48 ff c6 38 d0 74 07 19 c0 83 c8 01 eb 06 84 c0
RIP  [<ffffffff813b1e98>] strcmp+0x6/0x21
 RSP <ffff88003f33fe00>
CR2: 0000000000000000
---[ end trace 73aaba243cb4fa42 ]---

I bisected it back to the following commit:

d05070091849015f8c5b7d55cd75b86ebb61b3ec is the first bad commit
commit d05070091849015f8c5b7d55cd75b86ebb61b3ec
Author: David J. Choi <david.choi@micrel.com>
Date:   Thu Apr 29 06:12:41 2010 +0000

    drivers/net/phy: micrel phy driver
    
    This is the first version of phy driver from Micrel Inc.
    
    Signed-off-by: David J. Choi <david.choi@micrel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

the config had:

  CONFIG_MICREL_PHY=y

Disabling the driver fixes the crash.

Thanks,

	Ingo

Re: tip: origin tree boot crash (in the new micrel phy driver)

[David Miller]

From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 6 May 2010 11:59:40 +0200

> I bisected it back to the following commit:
> 
> d05070091849015f8c5b7d55cd75b86ebb61b3ec is the first bad commit
> commit d05070091849015f8c5b7d55cd75b86ebb61b3ec
> Author: David J. Choi <david.choi@micrel.com>
> Date:   Thu Apr 29 06:12:41 2010 +0000
> 
>     drivers/net/phy: micrel phy driver
>     
>     This is the first version of phy driver from Micrel Inc.
>     
>     Signed-off-by: David J. Choi <david.choi@micrel.com>
>     Signed-off-by: David S. Miller <davem@davemloft.net>
> 
> the config had:
> 
>   CONFIG_MICREL_PHY=y
> 
> Disabling the driver fixes the crash.

David please fix this crash, thanks.

Re: tip: origin tree boot crash (in the new micrel phy driver)

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Thu, 06 May 2010 03:10:40 -0700 (PDT)

> From: Ingo Molnar <mingo@elte.hu>
> Date: Thu, 6 May 2010 11:59:40 +0200
> 
>> I bisected it back to the following commit:
>> 
>> d05070091849015f8c5b7d55cd75b86ebb61b3ec is the first bad commit
>> commit d05070091849015f8c5b7d55cd75b86ebb61b3ec
>> Author: David J. Choi <david.choi@micrel.com>
>> Date:   Thu Apr 29 06:12:41 2010 +0000
>> 
>>     drivers/net/phy: micrel phy driver
 ...
>> Disabling the driver fixes the crash.
> 
> David please fix this crash, thanks.

Nevermind, Ingo please test this fix:

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 0cd80e4..e67691d 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -32,6 +32,7 @@ static int kszphy_config_init(struct phy_device *phydev)
 
 static struct phy_driver ks8001_driver = {
 	.phy_id		= PHY_ID_KS8001,
+	.name		= "Micrel KS8001",
 	.phy_id_mask	= 0x00fffff0,
 	.features	= PHY_BASIC_FEATURES,
 	.flags		= PHY_POLL,

Re: tip: origin tree boot crash (in the new micrel phy driver)

[Ingo Molnar]

* David Miller <davem@davemloft.net> wrote:

> From: David Miller <davem@davemloft.net>
> Date: Thu, 06 May 2010 03:10:40 -0700 (PDT)
> 
> > From: Ingo Molnar <mingo@elte.hu>
> > Date: Thu, 6 May 2010 11:59:40 +0200
> > 
> >> I bisected it back to the following commit:
> >> 
> >> d05070091849015f8c5b7d55cd75b86ebb61b3ec is the first bad commit
> >> commit d05070091849015f8c5b7d55cd75b86ebb61b3ec
> >> Author: David J. Choi <david.choi@micrel.com>
> >> Date:   Thu Apr 29 06:12:41 2010 +0000
> >> 
> >>     drivers/net/phy: micrel phy driver
>  ...
> >> Disabling the driver fixes the crash.
> > 
> > David please fix this crash, thanks.
> 
> Nevermind, Ingo please test this fix:
> 
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index 0cd80e4..e67691d 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -32,6 +32,7 @@ static int kszphy_config_init(struct phy_device *phydev)
>  
>  static struct phy_driver ks8001_driver = {
>  	.phy_id		= PHY_ID_KS8001,
> +	.name		= "Micrel KS8001",
>  	.phy_id_mask	= 0x00fffff0,
>  	.features	= PHY_BASIC_FEATURES,
>  	.flags		= PHY_POLL,

This fixes the crash, thanks Dave!

Tested-by: Ingo Molnar <mingo@elte.hu>

	Ingo