Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f8ba75e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking update from David Miller:
 "A couple weeks of bug fixing in there.  The largest chunk is all the
  broken crap Amerigo Wang found in the netpoll layer."

 1) netpoll and it's users has several serious bugs:
    a) uses GFP_KERNEL with locks held
    b) interfaces requiring interrupts disabled are called with them
       enabled
    c) and vice versa
    d) VLAN tag demuxing, as per all other RX packet input paths, is not
       applied

    All from Amerigo Wang.

 2) Hopefully cure the ipv4 mapped ipv6 address TCP early demux bugs for
    good, from Neal Cardwell.

 3) Unlike AF_UNIX, AF_PACKET sockets don't set a default credentials
    when the user doesn't specify one explicitly during sendmsg().
    Instead we attach an empty (zero) SCM credential block which is
    definitely not what we want.  Fix from Eric Dumazet.

 4) IPv6 illegally invokes netdevice notifiers with RCU lock held, fix
    from Ben Hutchings.

 5) inet_csk_route_child_sock() checks wrong inet options pointer, fix
    from Christoph Paasch.

 6) When AF_PACKET is used for transmit, packet loopback doesn't behave
    properly when a socket fanout is enabled, from Eric Leblond.

 7) On bluetooth l2cap channel create failure, we leak the socket, from
    Jaganath Kanakkassery.

 8) Fix all the netprio file handling bugs found by Al Viro, from John
    Fastabend.

 9) Several error return and NULL deref bug fixes in networking drivers
    from Julia Lawall.

10) A large smattering of struct padding et al.  kernel memory leaks to
    userspace found of Mathias Krause.

11) Conntrack expections in netfilter can access an uninitialized timer,
    fix from Pablo Neira Ayuso.

12) Several netfilter SIP tracker bug fixes from Patrick McHardy.

13) IPSEC ipv6 routes are not initialized correctly all the time,
    resulting in an OOPS in inet_putpeer().  Also from Patrick McHardy.

14) Bridging does rcu_dereference() outside of RCU protected area, from
    Stephen Hemminger.

15) Fix routing cache removal performance regression when looking up
    output routes that have a local destination.  From Zheng Yan.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (87 commits)
  af_netlink: force credentials passing [CVE-2012-3520]
  ipv4: fix ip header ident selection in __ip_make_skb()
  ipv4: Use newinet->inet_opt in inet_csk_route_child_sock()
  tcp: fix possible socket refcount problem
  net: tcp: move sk_rx_dst_set call after tcp_create_openreq_child()
  net/core/dev.c: fix kernel-doc warning
  netconsole: remove a redundant netconsole_target_put()
  net: ipv6: fix oops in inet_putpeer()
  net/stmmac: fix issue of clk_get for Loongson1B.
  caif: Do not dereference NULL in chnl_recv_cb()
  af_packet: don't emit packet on orig fanout group
  drivers/net/irda: fix error return code
  drivers/net/wan/dscc4.c: fix error return code
  drivers/net/wimax/i2400m/fw.c: fix error return code
  smsc75xx: add missing entry to MAINTAINERS
  net: qmi_wwan: new devices: UML290 and K5006-Z
  net: sh_eth: Add eth support for R8A7779 device
  netdev/phy: skip disabled mdio-mux nodes
  dt: introduce for_each_available_child_of_node, of_get_next_available_child
  net: netprio: fix cgrp create and write priomap race
  ...
parents 1456c75a e0e3cea4

Documentation/networking/netconsole.txt

+17 −2
Original line number Diff line number Diff line
@@ -51,8 +51,23 @@ Built-in netconsole starts immediately after the TCP stack is 
initialized and attempts to bring up the supplied dev at the supplied

address.



The remote host can run either 'netcat -u -l -p <port>',

'nc -l -u <port>' or syslogd.

The remote host has several options to receive the kernel messages,

for example:



1) syslogd



2) netcat



   On distributions using a BSD-based netcat version (e.g. Fedora,

   openSUSE and Ubuntu) the listening port must be specified without

   the -p switch:



   'nc -u -l -p <port>' / 'nc -u -l <port>' or

   'netcat -u -l -p <port>' / 'netcat -u -l <port>'



3) socat



   'socat udp-recv:<port> -'



Dynamic reconfiguration:

========================

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7288,6 +7288,12 @@ W: http://www.connecttech.com 
S:	Supported

F:	drivers/usb/serial/whiteheat*



USB SMSC75XX ETHERNET DRIVER

M:	Steve Glendinning <steve.glendinning@shawell.net>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/usb/smsc75xx.*



USB SMSC95XX ETHERNET DRIVER

M:	Steve Glendinning <steve.glendinning@shawell.net>

L:	netdev@vger.kernel.org

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0489, 0xe057) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -104,6 +105,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static struct usb_device_id btusb_table[] = { 
	{ USB_DEVICE(0x0a5c, 0x21e6) },

	{ USB_DEVICE(0x0a5c, 0x21e8) },

	{ USB_DEVICE(0x0a5c, 0x21f3) },

	{ USB_DEVICE(0x0a5c, 0x21f4) },

	{ USB_DEVICE(0x413c, 0x8197) },



	/* Foxconn - Hon Hai */
@@ -133,6 +134,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },

drivers/net/bonding/bond_main.c

+5 −7
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, 
		     sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping));

	skb->queue_mapping = qdisc_skb_cb(skb)->slave_dev_queue_mapping;



	if (unlikely(netpoll_tx_running(slave_dev)))

	if (unlikely(netpoll_tx_running(bond->dev)))

		bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);

	else

		dev_queue_xmit(skb);
@@ -1235,12 +1235,12 @@ static inline int slave_enable_netpoll(struct slave *slave) 
	struct netpoll *np;

	int err = 0;



	np = kzalloc(sizeof(*np), GFP_KERNEL);

	np = kzalloc(sizeof(*np), GFP_ATOMIC);

	err = -ENOMEM;

	if (!np)

		goto out;



	err = __netpoll_setup(np, slave->dev);

	err = __netpoll_setup(np, slave->dev, GFP_ATOMIC);

	if (err) {

		kfree(np);

		goto out;
@@ -1257,9 +1257,7 @@ static inline void slave_disable_netpoll(struct slave *slave) 
		return;



	slave->np = NULL;

	synchronize_rcu_bh();

	__netpoll_cleanup(np);

	kfree(np);

	__netpoll_free_rcu(np);

}

static inline bool slave_dev_support_netpoll(struct net_device *slave_dev)

{
@@ -1292,7 +1290,7 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev) 
	read_unlock(&bond->lock);

}



static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)

static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, gfp_t gfp)

{

	struct bonding *bond = netdev_priv(dev);

	struct slave *slave;