Commit 291abfea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) Unbalanced locking in mwifiex_process_country_ie, from Brian Norris.

 2) Fix thermal zone registration in iwlwifi, from Andrei
    Otcheretianski.

 3) Fix double free_irq in sgi ioc3 eth, from Thomas Bogendoerfer.

 4) Use after free in mptcp, from Florian Westphal.

 5) Use after free in wireguard's root_remove_peer_lists, from Eric
    Dumazet.

 6) Properly access packets heads in bonding alb code, from Eric
    Dumazet.

 7) Fix data race in skb_queue_len(), from Qian Cai.

 8) Fix regression in r8169 on some chips, from Heiner Kallweit.

 9) Fix XDP program ref counting in hv_netvsc, from Haiyang Zhang.

10) Certain kinds of set link netlink operations can cause a NULL deref
    in the ipv6 addrconf code. Fix from Eric Dumazet.

11) Don't cancel uninitialized work queue in drop monitor, from Ido
    Schimmel.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (84 commits)
  net: thunderx: use proper interface type for RGMII
  mt76: mt7615: fix max_nss in mt7615_eeprom_parse_hw_cap
  bpf: Improve bucket_log calculation logic
  selftests/bpf: Test freeing sockmap/sockhash with a socket in it
  bpf, sockhash: Synchronize_rcu before free'ing map
  bpf, sockmap: Don't sleep while holding RCU lock on tear-down
  bpftool: Don't crash on missing xlated program instructions
  bpf, sockmap: Check update requirements after locking
  drop_monitor: Do not cancel uninitialized work item
  mlxsw: spectrum_dpipe: Add missing error path
  mlxsw: core: Add validation of hardware device types for MGPIR register
  mlxsw: spectrum_router: Clear offload indication from IPv6 nexthops on abort
  selftests: mlxsw: Add test cases for local table route replacement
  mlxsw: spectrum_router: Prevent incorrect replacement of local table routes
  net: dsa: microchip: enable module autoprobe
  ipv6/addrconf: fix potential NULL deref in inet6_set_link_af()
  dpaa_eth: support all modes with rate adapting PHYs
  net: stmmac: update pci platform data to use phy_interface
  net: stmmac: xgmac: fix missing IFF_MULTICAST checki in dwxgmac2_set_filter
  net: stmmac: fix missing IFF_MULTICAST check in dwmac4_set_filter
  ...
parents d4f309ca 29ca3b31

drivers/net/bonding/bond_alb.c

+32 −12
Original line number Diff line number Diff line
@@ -1383,26 +1383,31 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
	bool do_tx_balance = true;

	u32 hash_index = 0;

	const u8 *hash_start = NULL;

	struct ipv6hdr *ip6hdr;



	skb_reset_mac_header(skb);

	eth_data = eth_hdr(skb);



	switch (ntohs(skb->protocol)) {

	case ETH_P_IP: {

		const struct iphdr *iph = ip_hdr(skb);

		const struct iphdr *iph;



		if (is_broadcast_ether_addr(eth_data->h_dest) ||

		    iph->daddr == ip_bcast ||

		    iph->protocol == IPPROTO_IGMP) {

		    !pskb_network_may_pull(skb, sizeof(*iph))) {

			do_tx_balance = false;

			break;

		}

		iph = ip_hdr(skb);

		if (iph->daddr == ip_bcast || iph->protocol == IPPROTO_IGMP) {

			do_tx_balance = false;

			break;

		}

		hash_start = (char *)&(iph->daddr);

		hash_size = sizeof(iph->daddr);

	}

		break;

	case ETH_P_IPV6:

	}

	case ETH_P_IPV6: {

		const struct ipv6hdr *ip6hdr;



		/* IPv6 doesn't really use broadcast mac address, but leave

		 * that here just in case.

		 */
@@ -1419,7 +1424,11 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
			break;

		}



		/* Additianally, DAD probes should not be tx-balanced as that

		if (!pskb_network_may_pull(skb, sizeof(*ip6hdr))) {

			do_tx_balance = false;

			break;

		}

		/* Additionally, DAD probes should not be tx-balanced as that

		 * will lead to false positives for duplicate addresses and

		 * prevent address configuration from working.

		 */
@@ -1429,17 +1438,26 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
			break;

		}



		hash_start = (char *)&(ipv6_hdr(skb)->daddr);

		hash_size = sizeof(ipv6_hdr(skb)->daddr);

		hash_start = (char *)&ip6hdr->daddr;

		hash_size = sizeof(ip6hdr->daddr);

		break;

	case ETH_P_IPX:

		if (ipx_hdr(skb)->ipx_checksum != IPX_NO_CHECKSUM) {

	}

	case ETH_P_IPX: {

		const struct ipxhdr *ipxhdr;



		if (pskb_network_may_pull(skb, sizeof(*ipxhdr))) {

			do_tx_balance = false;

			break;

		}

		ipxhdr = (struct ipxhdr *)skb_network_header(skb);



		if (ipxhdr->ipx_checksum != IPX_NO_CHECKSUM) {

			/* something is wrong with this packet */

			do_tx_balance = false;

			break;

		}



		if (ipx_hdr(skb)->ipx_type != IPX_TYPE_NCP) {

		if (ipxhdr->ipx_type != IPX_TYPE_NCP) {

			/* The only protocol worth balancing in

			 * this family since it has an "ARP" like

			 * mechanism
@@ -1448,9 +1466,11 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
			break;

		}



		eth_data = eth_hdr(skb);

		hash_start = (char *)eth_data->h_dest;

		hash_size = ETH_ALEN;

		break;

	}

	case ETH_P_ARP:

		do_tx_balance = false;

		if (bond_info->rlb_enabled)

drivers/net/dsa/b53/b53_common.c

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ int b53_configure_vlan(struct dsa_switch *ds) 
		b53_do_vlan_op(dev, VTA_CMD_CLEAR);

	}



	b53_enable_vlan(dev, false, ds->vlan_filtering);

	b53_enable_vlan(dev, dev->vlan_enabled, ds->vlan_filtering);



	b53_for_each_port(dev, i)

		b53_write16(dev, B53_VLAN_PAGE,

drivers/net/dsa/bcm_sf2.c

+3 −1
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) 


		/* Force link status for IMP port */

		reg = core_readl(priv, offset);

		reg |= (MII_SW_OR | LINK_STS | GMII_SPEED_UP_2G);

		reg |= (MII_SW_OR | LINK_STS);

		if (priv->type == BCM7278_DEVICE_ID)

			reg |= GMII_SPEED_UP_2G;

		core_writel(priv, reg, offset);



		/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */

drivers/net/dsa/microchip/ksz9477_spi.c

+6 −0
Original line number Diff line number Diff line
@@ -101,6 +101,12 @@ static struct spi_driver ksz9477_spi_driver = { 


module_spi_driver(ksz9477_spi_driver);



MODULE_ALIAS("spi:ksz9477");

MODULE_ALIAS("spi:ksz9897");

MODULE_ALIAS("spi:ksz9893");

MODULE_ALIAS("spi:ksz9563");

MODULE_ALIAS("spi:ksz8563");

MODULE_ALIAS("spi:ksz9567");

MODULE_AUTHOR("Woojung Huh <Woojung.Huh@microchip.com>");

MODULE_DESCRIPTION("Microchip KSZ9477 Series Switch SPI access Driver");

MODULE_LICENSE("GPL");

drivers/net/ethernet/broadcom/bcmsysport.c

+3 −0
Original line number Diff line number Diff line
@@ -2736,6 +2736,9 @@ static int __maybe_unused bcm_sysport_resume(struct device *d) 


	umac_reset(priv);



	/* Disable the UniMAC RX/TX */

	umac_enable_set(priv, CMD_RX_EN | CMD_TX_EN, 0);



	/* We may have been suspended and never received a WOL event that

	 * would turn off MPD detection, take care of that now

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE