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

Commit 86ca984c 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:
 "Mostly netfilter bug fixes in here, but we have some bits elsewhere as
  well.

   1) Don't do SNAT replies for non-NATed connections in IPVS, from
      Julian Anastasov.

   2) Don't delete conntrack helpers while they are still in use, from
      Liping Zhang.

   3) Fix zero padding in xtables's xt_data_to_user(), from Willem de
      Bruijn.

   4) Add proper RCU protection to nf_tables_dump_set() because we
      cannot guarantee that we hold the NFNL_SUBSYS_NFTABLES lock. From
      Liping Zhang.

   5) Initialize rcv_mss in tcp_disconnect(), from Wei Wang.

   6) smsc95xx devices can't handle IPV6 checksums fully, so don't
      advertise support for offloading them. From Nisar Sayed.

   7) Fix out-of-bounds access in __ip6_append_data(), from Eric
      Dumazet.

   8) Make atl2_probe() propagate the error code properly on failures,
      from Alexey Khoroshilov.

   9) arp_target[] in bond_check_params() is used uninitialized. This
      got changes from a global static to a local variable, which is how
      this mistake happened. Fix from Jarod Wilson.

  10) Fix fallout from unnecessary NULL check removal in cls_matchall,
      from Jiri Pirko. This is definitely brown paper bag territory..."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
  net: sched: cls_matchall: fix null pointer dereference
  vsock: use new wait API for vsock_stream_sendmsg()
  bonding: fix randomly populated arp target array
  net: Make IP alignment calulations clearer.
  bonding: fix accounting of active ports in 3ad
  net: atheros: atl2: don't return zero on failure path in atl2_probe()
  ipv6: fix out of bound writes in __ip6_append_data()
  bridge: start hello_timer when enabling KERNEL_STP in br_stp_start
  smsc95xx: Support only IPv4 TCP/UDP csum offload
  arp: always override existing neigh entries with gratuitous ARP
  arp: postpone addr_type calculation to as late as possible
  arp: decompose is_garp logic into a separate function
  arp: fixed error in a comment
  tcp: initialize rcv_mss to TCP_MIN_MSS instead of 0
  netfilter: xtables: fix build failure from COMPAT_XT_ALIGN outside CONFIG_COMPAT
  ebtables: arpreply: Add the standard target sanity check
  netfilter: nf_tables: revisit chain/object refcounting from elements
  netfilter: nf_tables: missing sanitization in data from userspace
  netfilter: nf_tables: can't assume lock is acquired when dumping set elems
  netfilter: synproxy: fix conntrackd interaction
  ...
parents 08332893 2d76b2f8

drivers/net/bonding/bond_3ad.c

+1 −1
Original line number Diff line number Diff line
@@ -2577,7 +2577,7 @@ int __bond_3ad_get_active_agg_info(struct bonding *bond, 
		return -1;



	ad_info->aggregator_id = aggregator->aggregator_identifier;

	ad_info->ports = aggregator->num_of_ports;

	ad_info->ports = __agg_active_ports(aggregator);

	ad_info->actor_key = aggregator->actor_oper_aggregator_key;

	ad_info->partner_key = aggregator->partner_oper_aggregator_key;

	ether_addr_copy(ad_info->partner_system,

drivers/net/bonding/bond_main.c

+2 −3
Original line number Diff line number Diff line
@@ -4271,10 +4271,10 @@ static int bond_check_params(struct bond_params *params) 
	int arp_validate_value, fail_over_mac_value, primary_reselect_value, i;

	struct bond_opt_value newval;

	const struct bond_opt_value *valptr;

	int arp_all_targets_value;

	int arp_all_targets_value = 0;

	u16 ad_actor_sys_prio = 0;

	u16 ad_user_port_key = 0;

	__be32 arp_target[BOND_MAX_ARP_TARGETS];

	__be32 arp_target[BOND_MAX_ARP_TARGETS] = { 0 };

	int arp_ip_count;

	int bond_mode	= BOND_MODE_ROUNDROBIN;

	int xmit_hashtype = BOND_XMIT_POLICY_LAYER2;
@@ -4501,7 +4501,6 @@ static int bond_check_params(struct bond_params *params) 
		arp_validate_value = 0;

	}



	arp_all_targets_value = 0;

	if (arp_all_targets) {

		bond_opt_initstr(&newval, arp_all_targets);

		valptr = bond_opt_parse(bond_opt_get(BOND_OPT_ARP_ALL_TARGETS),

drivers/net/ethernet/atheros/atlx/atl2.c

+4 −4
Original line number Diff line number Diff line
@@ -1353,6 +1353,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) &&

		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {

		printk(KERN_ERR "atl2: No usable DMA configuration, aborting\n");

		err = -EIO;

		goto err_dma;

	}
@@ -1366,10 +1367,11 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * pcibios_set_master to do the needed arch specific settings */

	pci_set_master(pdev);



	err = -ENOMEM;

	netdev = alloc_etherdev(sizeof(struct atl2_adapter));

	if (!netdev)

	if (!netdev) {

		err = -ENOMEM;

		goto err_alloc_etherdev;

	}



	SET_NETDEV_DEV(netdev, &pdev->dev);
@@ -1408,8 +1410,6 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		goto err_sw_init;



	err = -EIO;



	netdev->hw_features = NETIF_F_HW_VLAN_CTAG_RX;

	netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);

drivers/net/usb/smsc95xx.c

+10 −3
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static int smsc95xx_set_features(struct net_device *netdev, 
	if (ret < 0)

		return ret;



	if (features & NETIF_F_HW_CSUM)

	if (features & NETIF_F_IP_CSUM)

		read_buf |= Tx_COE_EN_;

	else

		read_buf &= ~Tx_COE_EN_;
@@ -1279,12 +1279,19 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) 


	spin_lock_init(&pdata->mac_cr_lock);



	/* LAN95xx devices do not alter the computed checksum of 0 to 0xffff.

	 * RFC 2460, ipv6 UDP calculated checksum yields a result of zero must

	 * be changed to 0xffff. RFC 768, ipv4 UDP computed checksum is zero,

	 * it is transmitted as all ones. The zero transmitted checksum means

	 * transmitter generated no checksum. Hence, enable csum offload only

	 * for ipv4 packets.

	 */

	if (DEFAULT_TX_CSUM_ENABLE)

		dev->net->features |= NETIF_F_HW_CSUM;

		dev->net->features |= NETIF_F_IP_CSUM;

	if (DEFAULT_RX_CSUM_ENABLE)

		dev->net->features |= NETIF_F_RXCSUM;



	dev->net->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM;

	dev->net->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM;



	smsc95xx_init_mac_address(dev);

include/linux/netfilter/x_tables.h

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ int xt_match_to_user(const struct xt_entry_match *m, 
int xt_target_to_user(const struct xt_entry_target *t,

		      struct xt_entry_target __user *u);

int xt_data_to_user(void __user *dst, const void *src,

		    int usersize, int size);

		    int usersize, int size, int aligned_size);



void *xt_copy_counters_from_user(const void __user *user, unsigned int len,

				 struct xt_counters_info *info, bool compat);