Commit f1baf68e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from netfilter and can.

Current release - new code bugs:

   - sparx5: fix get_stat64 out-of-bound access and crash

   - smc: fix netdev ref tracker misuse

  Previous releases - regressions:

   - eth: ixgbevf: require large buffers for build_skb on 82599VF, avoid
     overflows

   - eth: ocelot: fix all IP traffic getting trapped to CPU with PTP
     over IP

   - bonding: fix rare link activation misses in 802.3ad mode

  Previous releases - always broken:

   - tcp: fix tcp sock mem accounting in zero-copy corner cases

   - remove the cached dst when uncloning an skb dst and its metadata,
     since we only have one ref it'd lead to an UaF

   - netfilter:
      - conntrack: don't refresh sctp entries in closed state
      - conntrack: re-init state for retransmitted syn-ack, avoid
        connection establishment getting stuck with strange stacks
      - ctnetlink: disable helper autoassign, avoid it getting lost
      - nft_payload: don't allow transport header access for fragments

   - dsa: fix use of devres for mdio throughout drivers

   - eth: amd-xgbe: disable interrupts during pci removal

   - eth: dpaa2-eth: unregister netdev before disconnecting the PHY

   - eth: ice: fix IPIP and SIT TSO offload"

* tag 'net-5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (53 commits)
  net: dsa: mv88e6xxx: fix use-after-free in mv88e6xxx_mdios_unregister
  net: mscc: ocelot: fix mutex lock error during ethtool stats read
  ice: Avoid RTNL lock when re-creating auxiliary device
  ice: Fix KASAN error in LAG NETDEV_UNREGISTER handler
  ice: fix IPIP and SIT TSO offload
  ice: fix an error code in ice_cfg_phy_fec()
  net: mpls: Fix GCC 12 warning
  dpaa2-eth: unregister the netdev before disconnecting from the PHY
  skbuff: cleanup double word in comment
  net: macb: Align the dma and coherent dma masks
  mptcp: netlink: process IPv6 addrs in creating listening sockets
  selftests: mptcp: add missing join check
  net: usb: qmi_wwan: Add support for Dell DW5829e
  vlan: move dev_put into vlan_dev_uninit
  vlan: introduce vlan_dev_free_egress_priority
  ax25: fix UAF bugs of net_device caused by rebinding operation
  net: dsa: fix panic when DSA master device unbinds on shutdown
  net: amd-xgbe: disable interrupts during pci removal
  tipc: rate limit warning for received illegal binding update
  net: mdio: aspeed: Add missing MODULE_DEVICE_TABLE
  ...
parents 16f7432c 51a04ebf

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -13303,8 +13303,8 @@ W: http://www.iptables.org/ 
W:	http://www.nftables.org/

Q:	http://patchwork.ozlabs.org/project/netfilter-devel/list/

C:	irc://irc.libera.chat/netfilter

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git

F:	include/linux/netfilter*

F:	include/linux/netfilter/

F:	include/net/netfilter/

drivers/net/bonding/bond_3ad.c

+2 −1
Original line number Diff line number Diff line
@@ -1021,8 +1021,8 @@ static void ad_mux_machine(struct port *port, bool *update_slave_arr) 
				if (port->aggregator &&

				    port->aggregator->is_active &&

				    !__port_is_enabled(port)) {



					__enable_port(port);

					*update_slave_arr = true;

				}

			}

			break;
@@ -1779,6 +1779,7 @@ static void ad_agg_selection_logic(struct aggregator *agg, 
			     port = port->next_port_in_aggregator) {

				__enable_port(port);

			}

			*update_slave_arr = true;

		}

	}

drivers/net/dsa/bcm_sf2.c

+5 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds) 
	get_device(&priv->master_mii_bus->dev);

	priv->master_mii_dn = dn;



	priv->slave_mii_bus = devm_mdiobus_alloc(ds->dev);

	priv->slave_mii_bus = mdiobus_alloc();

	if (!priv->slave_mii_bus) {

		of_node_put(dn);

		return -ENOMEM;
@@ -681,8 +681,10 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds) 
	}



	err = mdiobus_register(priv->slave_mii_bus);

	if (err && dn)

	if (err && dn) {

		mdiobus_free(priv->slave_mii_bus);

		of_node_put(dn);

	}



	return err;

}
@@ -690,6 +692,7 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds) 
static void bcm_sf2_mdio_unregister(struct bcm_sf2_priv *priv)

{

	mdiobus_unregister(priv->slave_mii_bus);

	mdiobus_free(priv->slave_mii_bus);

	of_node_put(priv->master_mii_dn);

}

drivers/net/dsa/lantiq_gswip.c

+11 −3
Original line number Diff line number Diff line
@@ -498,8 +498,9 @@ static int gswip_mdio_rd(struct mii_bus *bus, int addr, int reg) 
static int gswip_mdio(struct gswip_priv *priv, struct device_node *mdio_np)

{

	struct dsa_switch *ds = priv->ds;

	int err;



	ds->slave_mii_bus = devm_mdiobus_alloc(priv->dev);

	ds->slave_mii_bus = mdiobus_alloc();

	if (!ds->slave_mii_bus)

		return -ENOMEM;
@@ -512,7 +513,11 @@ static int gswip_mdio(struct gswip_priv *priv, struct device_node *mdio_np) 
	ds->slave_mii_bus->parent = priv->dev;

	ds->slave_mii_bus->phy_mask = ~ds->phys_mii_mask;



	return of_mdiobus_register(ds->slave_mii_bus, mdio_np);

	err = of_mdiobus_register(ds->slave_mii_bus, mdio_np);

	if (err)

		mdiobus_free(ds->slave_mii_bus);



	return err;

}



static int gswip_pce_table_entry_read(struct gswip_priv *priv,
@@ -2145,8 +2150,10 @@ static int gswip_probe(struct platform_device *pdev) 
	gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);

	dsa_unregister_switch(priv->ds);

mdio_bus:

	if (mdio_np)

	if (mdio_np) {

		mdiobus_unregister(priv->ds->slave_mii_bus);

		mdiobus_free(priv->ds->slave_mii_bus);

	}

put_mdio_node:

	of_node_put(mdio_np);

	for (i = 0; i < priv->num_gphy_fw; i++)
@@ -2169,6 +2176,7 @@ static int gswip_remove(struct platform_device *pdev) 


	if (priv->ds->slave_mii_bus) {

		mdiobus_unregister(priv->ds->slave_mii_bus);

		mdiobus_free(priv->ds->slave_mii_bus);

		of_node_put(priv->ds->slave_mii_bus->dev.of_node);

	}

drivers/net/dsa/mt7530.c

+1 −1
Original line number Diff line number Diff line
@@ -2074,7 +2074,7 @@ mt7530_setup_mdio(struct mt7530_priv *priv) 
	if (priv->irq)

		mt7530_setup_mdio_irq(priv);



	ret = mdiobus_register(bus);

	ret = devm_mdiobus_register(dev, bus);

	if (ret) {

		dev_err(dev, "failed to register MDIO bus: %d\n", ret);

		if (priv->irq)