Message-Id: <20130417.014206.1953893579087210587.davem@davemloft.net>
Date:	Wed, 17 Apr 2013 01:42:06 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	torvalds@...ux-foundation.org
CC:	akpm@...ux-foundation.org, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [GIT] Networking


1) Fix erroneous netfilter drop of SIP packets generated by some Cisco
   phones, from Patrick McHardy.

2) Fix netfilter IPSET refcounting in list_set_add(), from Jozsef
   Kadlecsik.

3) Fix TCP syncookies route lookup key, we don't use the same values
   we would use for the usual SYN receive processing, from Dmitry
   Popov.

4) Fix NULL deref in bond_slave_netdev_event(), from Nikolay
   Aleksandrov.

5) When bonding enslave fails, we can forget to clear the IFF_BONDING
   bit, fix also from Nikolay Aleksandrov.

6) skb->csum_start is 16-bits, which is almost always just fine.
   But if we reallocate the headroom of an SKB this can push the
   skb->csum_start value outside of it's valid range.  This can
   easily happen when collapsing multiple SKBs from the retransmit
   queue together.

   Fix from Thomas Graf.

7) Fix NULL deref in be2net driver due to missing check of
   __vlan_put_tag() return value, from Ivan Vecera.

8) tun_set_iff() returns zero instead of error code on failure,
   fix from Wei Yongjun.

9) Like GARP, 802 MRP needs to hold the app->lock when adding MAD
   events and queueing PDUs.  Fix from David Ward.

10) Build fix, MVMDIO needs PHYLIB, from Thomas Petazzoni..

11) Fix mac80211 static with ipv6 modular build, from Cong Wang.

12) If userland specifies a path cost explicitly, do not override
    it when the carrier state changes.  From Stephen Hemminger.

13) mvnets calculates the TX queue to use incorrectly resulting in
    garbage pointer derefs and crashes, fix from Willy Tarreau.

14) cdc_mbim does erroneous sizeof(ETH_HLEN).  Fix from Bjorn Mork.

15) IP fragmentation can leak a refcount-less route out from an
    RCU protected section.  This results in crashes and all sorts
    of hard to diagnose behavior.  Fix from Eric Dumazet.

Please pull, thanks a lot!

The following changes since commit fe2971a01762963c62e9872bfcf0632546342c0f:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-04-10 14:15:27 -0700)

are available in the git repository at:

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

for you to fetch changes up to 361cd29cf9363505c2a35bbf9a034a22feebfb07:

  qlcnic: fix beaconing test for 82xx adapter (2013-04-17 01:15:29 -0400)

----------------------------------------------------------------
Bjørn Mork (1):
      net: cdc_mbim: remove bogus sizeof()

Christian Ruppert (1):
      stmmac: prevent interrupt loop with MMC RX IPC Counter

Christoph Fritz (1):
      can: sja1000: fix handling on dt properties on little endian systems

Cong Wang (1):
      ipv6: statically link register_inet6addr_notifier()

David S. Miller (2):
      Merge branch 'master' of git://git.kernel.org/.../pablo/nf into netfilter
      Merge branch 'fixes-for-3.9' of git://gitorious.org/linux-can/linux-can

David Ward (1):
      net/802/mrp: fix possible race condition when calling mrp_pdu_queue()

Dmitry Popov (1):
      tcp: incoming connections might use wrong route under synflood

Eric Dumazet (1):
      net: drop dst before queueing fragments

Florian Westphal (1):
      netfilter: nf_nat: fix race when unloading protocol modules

Himanshu Madhani (1):
      qlcnic: fix beaconing test for 82xx adapter

Ivan Vecera (1):
      be2net: take care of __vlan_put_tag return value

Jozsef Kadlecsik (2):
      netfilter: ipset: list:set: fix reference counter update
      netfilter: ipset: hash:*net*: nomatch flag not excluded on set resize

Lucas Stach (1):
      net: fec: fix regression in link change accounting

Marc Kleine-Budde (1):
      can: mcp251x: add missing IRQF_ONESHOT to request_threaded_irq

Mugunthan V N (1):
      drivers: net: ethernet: cpsw: get slave VLAN id from slave node instead of cpsw node

Patrick McHardy (1):
      netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the packet

Thomas Graf (1):
      tcp: Reallocate headroom if it would overflow csum_start

Thomas Petazzoni (1):
      net: mvmdio: add select PHYLIB

Wei Yongjun (2):
      tuntap: fix error return code in tun_set_iff()
      esp4: fix error return code in esp_output()

Willy Tarreau (1):
      net: mvneta: fix improper tx queue usage in mvneta_tx()

nikolay@...hat.com (2):
      bonding: fix netdev event NULL pointer dereference
      bonding: IFF_BONDING is not stripped on enslave failure

stephen hemminger (1):
      bridge: make user modified path cost sticky

 drivers/net/bonding/bond_main.c                   | 14 ++++++++++++--
 drivers/net/can/mcp251x.c                         | 10 ++++++++--
 drivers/net/can/sja1000/sja1000_of_platform.c     | 31 +++++++++++++++----------------
 drivers/net/ethernet/emulex/benet/be_main.c       |  5 +++--
 drivers/net/ethernet/freescale/fec.c              |  1 +
 drivers/net/ethernet/marvell/Kconfig              |  2 +-
 drivers/net/ethernet/marvell/mvneta.c             |  9 ++++-----
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c |  4 ++--
 drivers/net/ethernet/stmicro/stmmac/mmc_core.c    |  1 +
 drivers/net/ethernet/ti/cpsw.c                    |  2 +-
 drivers/net/tun.c                                 |  2 +-
 drivers/net/usb/cdc_mbim.c                        |  2 +-
 include/linux/netfilter/ipset/ip_set_ahash.h      | 30 +++++++++++++++++++++++-------
 include/net/addrconf.h                            |  1 +
 net/802/mrp.c                                     |  4 ++++
 net/bridge/br_if.c                                |  3 ++-
 net/bridge/br_private.h                           |  1 +
 net/bridge/br_stp_if.c                            |  1 +
 net/ipv4/esp4.c                                   |  6 +++---
 net/ipv4/ip_fragment.c                            | 14 ++++++++++----
 net/ipv4/syncookies.c                             |  4 ++--
 net/ipv4/tcp_output.c                             |  8 ++++++--
 net/ipv6/addrconf.c                               | 24 +++---------------------
 net/ipv6/addrconf_core.c                          | 19 +++++++++++++++++++
 net/ipv6/reassembly.c                             | 12 ++++++++++--
 net/netfilter/ipset/ip_set_hash_ipportnet.c       | 18 ++++++++++++++++++
 net/netfilter/ipset/ip_set_hash_net.c             | 22 ++++++++++++++++++++--
 net/netfilter/ipset/ip_set_hash_netiface.c        | 22 ++++++++++++++++++++--
 net/netfilter/ipset/ip_set_hash_netport.c         | 18 ++++++++++++++++++
 net/netfilter/ipset/ip_set_list_set.c             | 10 +++++++---
 net/netfilter/nf_conntrack_sip.c                  |  6 ++----
 net/netfilter/nf_nat_core.c                       | 40 +++++++---------------------------------
 32 files changed, 227 insertions(+), 119 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists