Commit 1cac3891 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from bluetooth, CAN and wireless.

  There are no known regressions currently under investigation.

  Current release - fix to a fix:

    - can: gs_usb_receive_bulk_callback(): fix error message

  Current release - regressions:

    - eth: gve: fix probe failure if clock read fails

  Previous releases - regressions:

    - ipv6: use the right ifindex when replying to icmpv6 from localhost

    - mptcp: fix race in mptcp_pm_nl_flush_addrs_doit()

    - bluetooth: fix null-ptr-deref in hci_uart_write_work

    - eth:
        - sfc: fix deadlock in RSS config read
        - ice: ifix NULL pointer dereference in ice_vsi_set_napi_queues
        - mlx5: fix memory leak in esw_acl_ingress_lgcy_setup()

  Previous releases - always broken:

    - core: fix segmentation of forwarding fraglist GRO

    - wifi: mac80211: correctly decode TTLM with default link map

    - mptcp: avoid dup SUB_CLOSED events after disconnect

    - nfc: fix memleak in nfc_llcp_send_ui_frame().

    - eth:
        - bonding: fix use-after-free due to enslave fail
        - mlx5e:
            - TC, delete flows only for existing peers
            - fix inverted cap check in tx flow table root disconnect"

* tag 'net-6.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (43 commits)
  net: fix segmentation of forwarding fraglist GRO
  wifi: mac80211: correctly decode TTLM with default link map
  selftests: mptcp: join: fix local endp not being tracked
  selftests: mptcp: check subflow errors in close events
  mptcp: only reset subflow errors when propagated
  selftests: mptcp: check no dup close events after error
  mptcp: avoid dup SUB_CLOSED events after disconnect
  net/mlx5e: Skip ESN replay window setup for IPsec crypto offload
  net/mlx5: Fix vhca_id access call trace use before alloc
  net/mlx5: fs, Fix inverted cap check in tx flow table root disconnect
  net: phy: micrel: fix clk warning when removing the driver
  net/mlx5e: don't assume psp tx skbs are ipv6 csum handling
  net: bridge: fix static key check
  nfc: nci: Fix race between rfkill and nci_unregister_device().
  gve: fix probe failure if clock read fails
  net/mlx5e: Account for netdev stats in ndo_get_stats64
  net/mlx5e: TC, delete flows only for existing peers
  net/mlx5: Fix Unbinding uplink-netdev in switchdev mode
  ice: stop counting UDP csum mismatch as rx_errors
  ice: Fix NULL pointer dereference in ice_vsi_set_napi_queues
  ...
parents e829083b 426ca15c

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -9260,7 +9260,6 @@ F: drivers/scsi/be2iscsi/ 
EMULEX 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net)

M:	Ajit Khaparde <ajit.khaparde@broadcom.com>

M:	Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>

M:	Somnath Kotur <somnath.kotur@broadcom.com>

L:	netdev@vger.kernel.org

S:	Maintained

W:	http://www.emulex.com

drivers/bluetooth/hci_ldisc.c

+2 −2
Original line number Diff line number Diff line
@@ -685,6 +685,8 @@ static int hci_uart_register_dev(struct hci_uart *hu) 
		return err;

	}



	set_bit(HCI_UART_PROTO_INIT, &hu->flags);



	if (test_bit(HCI_UART_INIT_PENDING, &hu->hdev_flags))

		return 0;
@@ -712,8 +714,6 @@ static int hci_uart_set_proto(struct hci_uart *hu, int id) 


	hu->proto = p;



	set_bit(HCI_UART_PROTO_INIT, &hu->flags);



	err = hci_uart_register_dev(hu);

	if (err) {

		return err;

drivers/net/bonding/bond_main.c

+15 −13
Original line number Diff line number Diff line
@@ -2202,11 +2202,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
		unblock_netpoll_tx();

	}



	/* broadcast mode uses the all_slaves to loop through slaves. */

	if (bond_mode_can_use_xmit_hash(bond) ||

	    BOND_MODE(bond) == BOND_MODE_BROADCAST)

		bond_update_slave_arr(bond, NULL);



	if (!slave_dev->netdev_ops->ndo_bpf ||

	    !slave_dev->netdev_ops->ndo_xdp_xmit) {

		if (bond->xdp_prog) {
@@ -2240,6 +2235,11 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
			bpf_prog_inc(bond->xdp_prog);

	}



	/* broadcast mode uses the all_slaves to loop through slaves. */

	if (bond_mode_can_use_xmit_hash(bond) ||

	    BOND_MODE(bond) == BOND_MODE_BROADCAST)

		bond_update_slave_arr(bond, NULL);



	bond_xdp_set_features(bond_dev);



	slave_info(bond_dev, slave_dev, "Enslaving as %s interface with %s link\n",
@@ -3047,8 +3047,8 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32 
			   __func__, &sip);

		return;

	}

	slave->last_rx = jiffies;

	slave->target_last_arp_rx[i] = jiffies;

	WRITE_ONCE(slave->last_rx, jiffies);

	WRITE_ONCE(slave->target_last_arp_rx[i], jiffies);

}



static int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,
@@ -3267,8 +3267,8 @@ static void bond_validate_na(struct bonding *bond, struct slave *slave, 
			  __func__, saddr);

		return;

	}

	slave->last_rx = jiffies;

	slave->target_last_arp_rx[i] = jiffies;

	WRITE_ONCE(slave->last_rx, jiffies);

	WRITE_ONCE(slave->target_last_arp_rx[i], jiffies);

}



static int bond_na_rcv(const struct sk_buff *skb, struct bonding *bond,
@@ -3338,7 +3338,7 @@ int bond_rcv_validate(const struct sk_buff *skb, struct bonding *bond, 
		    (slave_do_arp_validate_only(bond) && is_ipv6) ||

#endif

		    !slave_do_arp_validate_only(bond))

			slave->last_rx = jiffies;

			WRITE_ONCE(slave->last_rx, jiffies);

		return RX_HANDLER_ANOTHER;

	} else if (is_arp) {

		return bond_arp_rcv(skb, bond, slave);
@@ -3406,7 +3406,7 @@ static void bond_loadbalance_arp_mon(struct bonding *bond) 


		if (slave->link != BOND_LINK_UP) {

			if (bond_time_in_interval(bond, last_tx, 1) &&

			    bond_time_in_interval(bond, slave->last_rx, 1)) {

			    bond_time_in_interval(bond, READ_ONCE(slave->last_rx), 1)) {



				bond_propose_link_state(slave, BOND_LINK_UP);

				slave_state_changed = 1;
@@ -3430,8 +3430,10 @@ static void bond_loadbalance_arp_mon(struct bonding *bond) 
			 * when the source ip is 0, so don't take the link down

			 * if we don't know our ip yet

			 */

			if (!bond_time_in_interval(bond, last_tx, bond->params.missed_max) ||

			    !bond_time_in_interval(bond, slave->last_rx, bond->params.missed_max)) {

			if (!bond_time_in_interval(bond, last_tx,

						   bond->params.missed_max) ||

			    !bond_time_in_interval(bond, READ_ONCE(slave->last_rx),

						   bond->params.missed_max)) {



				bond_propose_link_state(slave, BOND_LINK_DOWN);

				slave_state_changed = 1;

drivers/net/bonding/bond_options.c

+4 −4
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ static void _bond_options_arp_ip_target_set(struct bonding *bond, int slot, 


	if (slot >= 0 && slot < BOND_MAX_ARP_TARGETS) {

		bond_for_each_slave(bond, slave, iter)

			slave->target_last_arp_rx[slot] = last_rx;

			WRITE_ONCE(slave->target_last_arp_rx[slot], last_rx);

		targets[slot] = target;

	}

}
@@ -1221,8 +1221,8 @@ static int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target) 
	bond_for_each_slave(bond, slave, iter) {

		targets_rx = slave->target_last_arp_rx;

		for (i = ind; (i < BOND_MAX_ARP_TARGETS-1) && targets[i+1]; i++)

			targets_rx[i] = targets_rx[i+1];

		targets_rx[i] = 0;

			WRITE_ONCE(targets_rx[i], READ_ONCE(targets_rx[i+1]));

		WRITE_ONCE(targets_rx[i], 0);

	}

	for (i = ind; (i < BOND_MAX_ARP_TARGETS-1) && targets[i+1]; i++)

		targets[i] = targets[i+1];
@@ -1377,7 +1377,7 @@ static void _bond_options_ns_ip6_target_set(struct bonding *bond, int slot, 


	if (slot >= 0 && slot < BOND_MAX_NS_TARGETS) {

		bond_for_each_slave(bond, slave, iter) {

			slave->target_last_arp_rx[slot] = last_rx;

			WRITE_ONCE(slave->target_last_arp_rx[slot], last_rx);

			slave_set_ns_maddr(bond, slave, target, &targets[slot]);

		}

		targets[slot] = *target;

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ static int at91_can_probe(struct platform_device *pdev) 
	if (IS_ERR(transceiver)) {

		err = PTR_ERR(transceiver);

		dev_err_probe(&pdev->dev, err, "failed to get phy\n");

		goto exit_iounmap;

		goto exit_free;

	}



	dev->netdev_ops	= &at91_netdev_ops;