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

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

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

Pull networking fixes from David Miller:

 1) Fix double-free in batman-adv, from Sven Eckelmann.

 2) Fix packet stats for fast-RX path, from Joannes Berg.

 3) Netfilter's ip_route_me_harder() doesn't handle request sockets
    properly, fix from Florian Westphal.

 4) Fix sendmsg deadlock in rxrpc, from David Howells.

 5) Add missing RCU locking to transport hashtable scan, from Xin Long.

 6) Fix potential packet loss in mlxsw driver, from Ido Schimmel.

 7) Fix race in NAPI handling between poll handlers and busy polling,
    from Eric Dumazet.

 8) TX path in vxlan and geneve need proper RCU locking, from Jakub
    Kicinski.

 9) SYN processing in DCCP and TCP need to disable BH, from Eric
    Dumazet.

10) Properly handle net_enable_timestamp() being invoked from IRQ
    context, also from Eric Dumazet.

11) Fix crash on device-tree systems in xgene driver, from Alban Bedel.

12) Do not call sk_free() on a locked socket, from Arnaldo Carvalho de
    Melo.

13) Fix use-after-free in netvsc driver, from Dexuan Cui.

14) Fix max MTU setting in bonding driver, from WANG Cong.

15) xen-netback hash table can be allocated from softirq context, so use
    GFP_ATOMIC. From Anoob Soman.

16) Fix MAC address change bug in bgmac driver, from Hari Vyas.

17) strparser needs to destroy strp_wq on module exit, from WANG Cong.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (69 commits)
  strparser: destroy workqueue on module exit
  sfc: fix IPID endianness in TSOv2
  sfc: avoid max() in array size
  rds: remove unnecessary returned value check
  rxrpc: Fix potential NULL-pointer exception
  nfp: correct DMA direction in XDP DMA sync
  nfp: don't tell FW about the reserved buffer space
  net: ethernet: bgmac: mac address change bug
  net: ethernet: bgmac: init sequence bug
  xen-netback: don't vfree() queues under spinlock
  xen-netback: keep a local pointer for vif in backend_disconnect()
  netfilter: nf_tables: don't call nfnetlink_set_err() if nfnetlink_send() fails
  netfilter: nft_set_rbtree: incorrect assumption on lower interval lookups
  netfilter: nf_conntrack_sip: fix wrong memory initialisation
  can: flexcan: fix typo in comment
  can: usb_8dev: Fix memory leak of priv->cmd_msg_buffer
  can: gs_usb: fix coding style
  can: gs_usb: Don't use stack memory for USB transfers
  ixgbe: Limit use of 2K buffers on architectures with 256B or larger cache lines
  ixgbe: update the rss key on h/w, when ethtool ask for it
  ...
parents 2d62e076 f78ef7cd

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -6011,9 +6011,8 @@ F: include/linux/hsi/ 
F:	include/uapi/linux/hsi/



HSO 3G MODEM DRIVER

M:	Jan Dumon <j.dumon@option.com>

W:	http://www.pharscape.org

S:	Maintained

L:	linux-usb@vger.kernel.org

S:	Orphan

F:	drivers/net/usb/hso.c



HSR NETWORK PROTOCOL

drivers/net/bonding/bond_main.c

+1 −0
Original line number Diff line number Diff line
@@ -4179,6 +4179,7 @@ void bond_setup(struct net_device *bond_dev) 


	/* Initialize the device entry points */

	ether_setup(bond_dev);

	bond_dev->max_mtu = ETH_MAX_MTU;

	bond_dev->netdev_ops = &bond_netdev_ops;

	bond_dev->ethtool_ops = &bond_ethtool_ops;

drivers/net/can/flexcan.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 
#define FLEXCAN_QUIRK_BROKEN_ERR_STATE	BIT(1) /* [TR]WRN_INT not connected */

#define FLEXCAN_QUIRK_DISABLE_RXFG	BIT(2) /* Disable RX FIFO Global mask */

#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS	BIT(3) /* Enable EACEN and RRS bit in ctrl2 */

#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disble Memory error detection */

#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disable Memory error detection */

#define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP	BIT(5) /* Use timestamp based offloading */



/* Structure of the message buffer */

drivers/net/can/usb/gs_usb.c

+34 −17
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb, 
				  hf,

				  urb->transfer_dma);





		if (rc == -ENODEV) {

			netif_device_detach(netdev);

		} else {
@@ -908,10 +907,14 @@ static int gs_usb_probe(struct usb_interface *intf, 
	struct gs_usb *dev;

	int rc = -ENOMEM;

	unsigned int icount, i;

	struct gs_host_config hconf = {

		.byte_order = 0x0000beef,

	};

	struct gs_device_config dconf;

	struct gs_host_config *hconf;

	struct gs_device_config *dconf;



	hconf = kmalloc(sizeof(*hconf), GFP_KERNEL);

	if (!hconf)

		return -ENOMEM;



	hconf->byte_order = 0x0000beef;



	/* send host config */

	rc = usb_control_msg(interface_to_usbdev(intf),
@@ -920,16 +923,22 @@ static int gs_usb_probe(struct usb_interface *intf, 
			     USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,

			     1,

			     intf->altsetting[0].desc.bInterfaceNumber,

			     &hconf,

			     sizeof(hconf),

			     hconf,

			     sizeof(*hconf),

			     1000);



	kfree(hconf);



	if (rc < 0) {

		dev_err(&intf->dev, "Couldn't send data format (err=%d)\n",

			rc);

		return rc;

	}



	dconf = kmalloc(sizeof(*dconf), GFP_KERNEL);

	if (!dconf)

		return -ENOMEM;



	/* read device config */

	rc = usb_control_msg(interface_to_usbdev(intf),

			     usb_rcvctrlpipe(interface_to_usbdev(intf), 0),
@@ -937,28 +946,33 @@ static int gs_usb_probe(struct usb_interface *intf, 
			     USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,

			     1,

			     intf->altsetting[0].desc.bInterfaceNumber,

			     &dconf,

			     sizeof(dconf),

			     dconf,

			     sizeof(*dconf),

			     1000);

	if (rc < 0) {

		dev_err(&intf->dev, "Couldn't get device config: (err=%d)\n",

			rc);

		kfree(dconf);

		return rc;

	}



	icount = dconf.icount + 1;

	icount = dconf->icount + 1;

	dev_info(&intf->dev, "Configuring for %d interfaces\n", icount);



	if (icount > GS_MAX_INTF) {

		dev_err(&intf->dev,

			"Driver cannot handle more that %d CAN interfaces\n",

			GS_MAX_INTF);

		kfree(dconf);

		return -EINVAL;

	}



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

	if (!dev)

	if (!dev) {

		kfree(dconf);

		return -ENOMEM;

	}



	init_usb_anchor(&dev->rx_submitted);



	atomic_set(&dev->active_channels, 0);
@@ -967,7 +981,7 @@ static int gs_usb_probe(struct usb_interface *intf, 
	dev->udev = interface_to_usbdev(intf);



	for (i = 0; i < icount; i++) {

		dev->canch[i] = gs_make_candev(i, intf, &dconf);

		dev->canch[i] = gs_make_candev(i, intf, dconf);

		if (IS_ERR_OR_NULL(dev->canch[i])) {

			/* save error code to return later */

			rc = PTR_ERR(dev->canch[i]);
@@ -978,12 +992,15 @@ static int gs_usb_probe(struct usb_interface *intf, 
				gs_destroy_candev(dev->canch[i]);



			usb_kill_anchored_urbs(&dev->rx_submitted);

			kfree(dconf);

			kfree(dev);

			return rc;

		}

		dev->canch[i]->parent = dev;

	}



	kfree(dconf);



	return 0;

}

drivers/net/can/usb/usb_8dev.c

+3 −6
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ static int usb_8dev_probe(struct usb_interface *intf, 
	for (i = 0; i < MAX_TX_URBS; i++)

		priv->tx_contexts[i].echo_index = MAX_TX_URBS;



	priv->cmd_msg_buffer = kzalloc(sizeof(struct usb_8dev_cmd_msg),

	priv->cmd_msg_buffer = devm_kzalloc(&intf->dev, sizeof(struct usb_8dev_cmd_msg),

					    GFP_KERNEL);

	if (!priv->cmd_msg_buffer)

		goto cleanup_candev;
@@ -966,7 +966,7 @@ static int usb_8dev_probe(struct usb_interface *intf, 
	if (err) {

		netdev_err(netdev,

			"couldn't register CAN device: %d\n", err);

		goto cleanup_cmd_msg_buffer;

		goto cleanup_candev;

	}



	err = usb_8dev_cmd_version(priv, &version);
@@ -987,9 +987,6 @@ static int usb_8dev_probe(struct usb_interface *intf, 
cleanup_unregister_candev:

	unregister_netdev(priv->netdev);



cleanup_cmd_msg_buffer:

	kfree(priv->cmd_msg_buffer);



cleanup_candev:

	free_candev(netdev);