Commit 504c25cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  A handful of awaited fixes here - revert of the FEC changes, bluetooth
  fix, fixes for iwlwifi spew.

  We added a warning in PHY/MDIO code which is triggering on a couple of
  platforms in a false-positive-ish way. If we can't iron that out over
  the week we'll drop it and re-add for 6.1.

  I've added a new "follow up fixes" section for fixes to fixes in
  6.0-rcs but it may actually give the false impression that those are
  problematic or that more testing time would have caught them. So
  likely a one time thing.

  Follow up fixes:

   - nf_tables_addchain: fix nft_counters_enabled underflow

   - ebtables: fix memory leak when blob is malformed

   - nf_ct_ftp: fix deadlock when nat rewrite is needed

  Current release - regressions:

   - Revert "fec: Restart PPS after link state change" and the related
     "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"

   - Bluetooth: fix HCIGETDEVINFO regression

   - wifi: mt76: fix 5 GHz connection regression on mt76x0/mt76x2

   - mptcp: fix fwd memory accounting on coalesce

   - rwlock removal fall out:
      - ipmr: always call ip{,6}_mr_forward() from RCU read-side
        critical section
      - ipv6: fix crash when IPv6 is administratively disabled

   - tcp: read multiple skbs in tcp_read_skb()

   - mdio_bus_phy_resume state warning fallout:
      - eth: ravb: fix PHY state warning splat during system resume
      - eth: sh_eth: fix PHY state warning splat during system resume

  Current release - new code bugs:

   - wifi: iwlwifi: don't spam logs with NSS>2 messages

   - eth: mtk_eth_soc: enable XDP support just for MT7986 SoC

  Previous releases - regressions:

   - bonding: fix NULL deref in bond_rr_gen_slave_id

   - wifi: iwlwifi: mark IWLMEI as broken

  Previous releases - always broken:

   - nf_conntrack helpers:
      - irc: tighten matching on DCC message
      - sip: fix ct_sip_walk_headers
      - osf: fix possible bogus match in nf_osf_find()

   - ipvlan: fix out-of-bound bugs caused by unset skb->mac_header

   - core: fix flow symmetric hash

   - bonding, team: unsync device addresses on ndo_stop

   - phy: micrel: fix shared interrupt on LAN8814"

* tag 'net-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (83 commits)
  selftests: forwarding: add shebang for sch_red.sh
  bnxt: prevent skb UAF after handing over to PTP worker
  net: marvell: Fix refcounting bugs in prestera_port_sfp_bind()
  net: sched: fix possible refcount leak in tc_new_tfilter()
  net: sunhme: Fix packet reception for len < RX_COPY_THRESHOLD
  udp: Use WARN_ON_ONCE() in udp_read_skb()
  selftests: bonding: cause oops in bond_rr_gen_slave_id
  bonding: fix NULL deref in bond_rr_gen_slave_id
  net: phy: micrel: fix shared interrupt on LAN8814
  net/smc: Stop the CLC flow if no link to map buffers on
  ice: Fix ice_xdp_xmit() when XDP TX queue number is not sufficient
  net: atlantic: fix potential memory leak in aq_ndev_close()
  can: gs_usb: gs_usb_set_phys_id(): return with error if identify is not supported
  can: gs_usb: gs_can_open(): fix race dev->can.state condition
  can: flexcan: flexcan_mailbox_read() fix return value for drop = true
  net: sh_eth: Fix PHY state warning splat during system resume
  net: ravb: Fix PHY state warning splat during system resume
  netfilter: nf_ct_ftp: fix deadlock when nat rewrite is needed
  netfilter: ebtables: fix memory leak when blob is malformed
  netfilter: nf_tables: fix percpu memory leak at nf_tables_addchain()
  ...
parents 129e7152 83e4b196

Documentation/networking/mptcp-sysctl.rst

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ allow_join_initial_addr_port - BOOLEAN 
	Default: 1



pm_type - INTEGER



	Set the default path manager type to use for each new MPTCP

	socket. In-kernel path management will control subflow

	connections and address advertisements according to

Documentation/networking/nf_conntrack-sysctl.rst

+0 −9
Original line number Diff line number Diff line
@@ -70,15 +70,6 @@ nf_conntrack_generic_timeout - INTEGER (seconds) 
	Default for generic timeout.  This refers to layer 4 unknown/unsupported

	protocols.



nf_conntrack_helper - BOOLEAN

	- 0 - disabled (default)

	- not 0 - enabled



	Enable automatic conntrack helper assignment.

	If disabled it is required to set up iptables rules to assign

	helpers to connections.  See the CT target description in the

	iptables-extensions(8) man page for further information.



nf_conntrack_icmp_timeout - INTEGER (seconds)

	default 30

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -8652,8 +8652,8 @@ F: drivers/input/touchscreen/goodix* 








GOOGLE ETHERNET DRIVERS









M:	Jeroen de Borst <jeroendb@google.com>









R:	Catherine Sullivan <csully@google.com>









R:	David Awogbemila <awogbemila@google.com>









M:	Catherine Sullivan <csully@google.com>









R:	Shailend Chand <shailend@google.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	Documentation/networking/device_drivers/ethernet/google/gve.rst








@@ -16857,6 +16857,7 @@ F:	drivers/net/ethernet/qualcomm/emac/















QUALCOMM ETHQOS ETHERNET DRIVER









M:	Vinod Koul <vkoul@kernel.org>









R:	Bhupesh Sharma <bhupesh.sharma@linaro.org>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/qcom,ethqos.txt








@@ -19959,6 +19960,7 @@ S:	Supported







F:	drivers/net/team/









F:	include/linux/if_team.h









F:	include/uapi/linux/if_team.h









F:	tools/testing/selftests/net/team/

















TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT









M:	"Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>

























drivers/net/bonding/bond_3ad.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -88,8 +88,9 @@ static const u8 null_mac_addr[ETH_ALEN + 2] __long_aligned = {







static const u16 ad_ticks_per_sec = 1000 / AD_TIMER_INTERVAL;









static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;



















static const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned =









	MULTICAST_LACPDU_ADDR;









const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned = {









	0x01, 0x80, 0xC2, 0x00, 0x00, 0x02









};



















/* ================= main 802.3ad protocol functions ================== */









static int ad_lacpdu_send(struct port *port);
































drivers/net/bonding/bond_main.c



+42
−30






























Original line number
Diff line number
Diff line







@@ -865,12 +865,8 @@ static void bond_hw_addr_flush(struct net_device *bond_dev,







	dev_uc_unsync(slave_dev, bond_dev);









	dev_mc_unsync(slave_dev, bond_dev);



















	if (BOND_MODE(bond) == BOND_MODE_8023AD) {









		/* del lacpdu mc addr from mc list */









		u8 lacpdu_multicast[ETH_ALEN] = MULTICAST_LACPDU_ADDR;



















		dev_mc_del(slave_dev, lacpdu_multicast);









	}









	if (BOND_MODE(bond) == BOND_MODE_8023AD)









		dev_mc_del(slave_dev, lacpdu_mcast_addr);









}



















/*--------------------------- Active slave change ---------------------------*/








@@ -890,6 +886,7 @@ static void bond_hw_addr_swap(struct bonding *bond, struct slave *new_active,







		if (bond->dev->flags & IFF_ALLMULTI)









			dev_set_allmulti(old_active->dev, -1);



















		if (bond->dev->flags & IFF_UP)









			bond_hw_addr_flush(bond->dev, old_active->dev);









	}


















@@ -901,12 +898,14 @@ static void bond_hw_addr_swap(struct bonding *bond, struct slave *new_active,







		if (bond->dev->flags & IFF_ALLMULTI)









			dev_set_allmulti(new_active->dev, 1);



















		if (bond->dev->flags & IFF_UP) {









			netif_addr_lock_bh(bond->dev);









			dev_uc_sync(new_active->dev, bond->dev);









			dev_mc_sync(new_active->dev, bond->dev);









			netif_addr_unlock_bh(bond->dev);









		}









	}









}



















/**









 * bond_set_dev_addr - clone slave's address to bond








@@ -2166,16 +2165,14 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,







			}









		}



















		if (bond_dev->flags & IFF_UP) {









			netif_addr_lock_bh(bond_dev);









			dev_mc_sync_multiple(slave_dev, bond_dev);









			dev_uc_sync_multiple(slave_dev, bond_dev);









			netif_addr_unlock_bh(bond_dev);



















		if (BOND_MODE(bond) == BOND_MODE_8023AD) {









			/* add lacpdu mc addr to mc list */









			u8 lacpdu_multicast[ETH_ALEN] = MULTICAST_LACPDU_ADDR;



















			dev_mc_add(slave_dev, lacpdu_multicast);









			if (BOND_MODE(bond) == BOND_MODE_8023AD)









				dev_mc_add(slave_dev, lacpdu_mcast_addr);









		}









	}


















@@ -2447,6 +2444,7 @@ static int __bond_release_one(struct net_device *bond_dev,







		if (old_flags & IFF_ALLMULTI)









			dev_set_allmulti(slave_dev, -1);



















		if (old_flags & IFF_UP)









			bond_hw_addr_flush(bond_dev, slave_dev);









	}


















@@ -4184,6 +4182,12 @@ static int bond_open(struct net_device *bond_dev)







	struct list_head *iter;









	struct slave *slave;



















	if (BOND_MODE(bond) == BOND_MODE_ROUNDROBIN && !bond->rr_tx_counter) {









		bond->rr_tx_counter = alloc_percpu(u32);









		if (!bond->rr_tx_counter)









			return -ENOMEM;









	}



















	/* reset slave->backup and slave->inactive */









	if (bond_has_slaves(bond)) {









		bond_for_each_slave(bond, slave, iter) {








@@ -4221,6 +4225,9 @@ static int bond_open(struct net_device *bond_dev)







		/* register to receive LACPDUs */









		bond->recv_probe = bond_3ad_lacpdu_recv;









		bond_3ad_initiate_agg_selection(bond, 1);



















		bond_for_each_slave(bond, slave, iter)









			dev_mc_add(slave->dev, lacpdu_mcast_addr);









	}



















	if (bond_mode_can_use_xmit_hash(bond))








@@ -4232,6 +4239,7 @@ static int bond_open(struct net_device *bond_dev)







static int bond_close(struct net_device *bond_dev)









{









	struct bonding *bond = netdev_priv(bond_dev);









	struct slave *slave;



















	bond_work_cancel_all(bond);









	bond->send_peer_notif = 0;








@@ -4239,6 +4247,19 @@ static int bond_close(struct net_device *bond_dev)







		bond_alb_deinitialize(bond);









	bond->recv_probe = NULL;



















	if (bond_uses_primary(bond)) {









		rcu_read_lock();









		slave = rcu_dereference(bond->curr_active_slave);









		if (slave)









			bond_hw_addr_flush(bond_dev, slave->dev);









		rcu_read_unlock();









	} else {









		struct list_head *iter;



















		bond_for_each_slave(bond, slave, iter)









			bond_hw_addr_flush(bond_dev, slave->dev);









	}



















	return 0;









}


















@@ -6228,15 +6249,6 @@ static int bond_init(struct net_device *bond_dev)







	if (!bond->wq)









		return -ENOMEM;



















	if (BOND_MODE(bond) == BOND_MODE_ROUNDROBIN) {









		bond->rr_tx_counter = alloc_percpu(u32);









		if (!bond->rr_tx_counter) {









			destroy_workqueue(bond->wq);









			bond->wq = NULL;









			return -ENOMEM;









		}









	}



















	spin_lock_init(&bond->stats_lock);









	netdev_lockdep_set_classes(bond_dev);