Commit 150b567e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bluetooth, netfilter and wireless.

  Current release - fix to a fix:

   - rtnetlink: fix error code in rtnl_newlink()

   - tipc: fix NULL deref in cleanup_bearer()

  Current release - regressions:

   - ip: fix warning about invalid return from in ip_route_input_rcu()

  Current release - new code bugs:

   - udp: fix L4 hash after reconnect

   - eth: lan969x: fix cyclic dependency between modules

   - eth: bnxt_en: fix potential crash when dumping FW log coredump

  Previous releases - regressions:

   - wifi: mac80211:
      - fix a queue stall in certain cases of channel switch
      - wake the queues in case of failure in resume

   - splice: do not checksum AF_UNIX sockets

   - virtio_net: fix BUG()s in BQL support due to incorrect accounting
     of purged packets during interface stop

   - eth:
      - stmmac: fix TSO DMA API mis-usage causing oops
      - bnxt_en: fixes for HW GRO: GSO type on 5750X chips and oops
        due to incorrect aggregation ID mask on 5760X chips

  Previous releases - always broken:

   - Bluetooth: improve setsockopt() handling of malformed user input

   - eth: ocelot: fix PTP timestamping in presence of packet loss

   - ptp: kvm: x86: avoid "fail to initialize ptp_kvm" when simply not
     supported"

* tag 'net-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (81 commits)
  net: dsa: tag_ocelot_8021q: fix broken reception
  net: dsa: microchip: KSZ9896 register regmap alignment to 32 bit boundaries
  net: renesas: rswitch: fix initial MPIC register setting
  Bluetooth: btmtk: avoid UAF in btmtk_process_coredump
  Bluetooth: iso: Fix circular lock in iso_conn_big_sync
  Bluetooth: iso: Fix circular lock in iso_listen_bis
  Bluetooth: SCO: Add support for 16 bits transparent voice setting
  Bluetooth: iso: Fix recursive locking warning
  Bluetooth: iso: Always release hdev at the end of iso_listen_bis
  Bluetooth: hci_event: Fix using rcu_read_(un)lock while iterating
  Bluetooth: hci_core: Fix sleeping function called from invalid context
  team: Fix feature propagation of NETIF_F_GSO_ENCAP_ALL
  team: Fix initial vlan_feature set in __team_compute_features
  bonding: Fix feature propagation of NETIF_F_GSO_ENCAP_ALL
  bonding: Fix initial {vlan,mpls}_feature set in bond_compute_features
  net, team, bonding: Add netdev_base_features helper
  net/sched: netem: account for backlog updates from child qdisc
  net: dsa: felix: fix stuck CPU-injected packets with short taprio windows
  splice: do not checksum AF_UNIX sockets
  net: usb: qmi_wwan: add Telit FE910C04 compositions
  ...
parents 231825b2 ad913dfd

Documentation/networking/ip-sysctl.rst

+6 −0
Original line number Diff line number Diff line
@@ -2170,6 +2170,12 @@ nexthop_compat_mode - BOOLEAN 
	understands the new API, this sysctl can be disabled to achieve full

	performance benefits of the new API by disabling the nexthop expansion

	and extraneous notifications.



	Note that as a backward-compatible mode, dumping of modern features

	might be incomplete or wrong. For example, resilient groups will not be

	shown as such, but rather as just a list of next hops. Also weights that

	do not fit into 8 bits will show incorrectly.



	Default: true (backward compat mode)



fib_notify_on_flag_change - INTEGER

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -15345,7 +15345,7 @@ M: Daniel Machon <daniel.machon@microchip.com> 
M:	UNGLinuxDriver@microchip.com

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/microchip/lan969x/*

F:	drivers/net/ethernet/microchip/sparx5/lan969x/*









MICROCHIP LCDFB DRIVER









M:	Nicolas Ferre <nicolas.ferre@microchip.com>








@@ -16337,6 +16337,7 @@ F:	Documentation/networking/







F:	Documentation/networking/net_cachelines/









F:	Documentation/process/maintainer-netdev.rst









F:	Documentation/userspace-api/netlink/









F:	include/linux/ethtool.h









F:	include/linux/framer/framer-provider.h









F:	include/linux/framer/framer.h









F:	include/linux/in.h








@@ -16351,6 +16352,7 @@ F:	include/linux/rtnetlink.h







F:	include/linux/seq_file_net.h









F:	include/linux/skbuff*









F:	include/net/









F:	include/uapi/linux/ethtool.h









F:	include/uapi/linux/genetlink.h









F:	include/uapi/linux/hsr_netlink.h









F:	include/uapi/linux/in.h
































drivers/bluetooth/btmtk.c



+12
−8






























Original line number
Diff line number
Diff line







@@ -395,6 +395,7 @@ int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb)







{









	struct btmtk_data *data = hci_get_priv(hdev);









	int err;









	bool complete = false;



















	if (!IS_ENABLED(CONFIG_DEV_COREDUMP)) {









		kfree_skb(skb);








@@ -416,16 +417,19 @@ int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb)







		fallthrough;









	case HCI_DEVCOREDUMP_ACTIVE:









	default:









		/* Mediatek coredump data would be more than MTK_COREDUMP_NUM */









		if (data->cd_info.cnt >= MTK_COREDUMP_NUM &&









		    skb->len > MTK_COREDUMP_END_LEN)









			if (!memcmp((char *)&skb->data[skb->len - MTK_COREDUMP_END_LEN],









				    MTK_COREDUMP_END, MTK_COREDUMP_END_LEN - 1))









				complete = true;



















		err = hci_devcd_append(hdev, skb);









		if (err < 0)









			break;









		data->cd_info.cnt++;



















		/* Mediatek coredump data would be more than MTK_COREDUMP_NUM */









		if (data->cd_info.cnt > MTK_COREDUMP_NUM &&









		    skb->len > MTK_COREDUMP_END_LEN)









			if (!memcmp((char *)&skb->data[skb->len - MTK_COREDUMP_END_LEN],









				    MTK_COREDUMP_END, MTK_COREDUMP_END_LEN - 1)) {









		if (complete) {









			bt_dev_info(hdev, "Mediatek coredump end");









			hci_devcd_complete(hdev);









		}
































drivers/net/bonding/bond_main.c



+5
−5






























Original line number
Diff line number
Diff line







@@ -1520,9 +1520,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev,







	struct slave *slave;



















	mask = features;



















	features &= ~NETIF_F_ONE_FOR_ALL;









	features |= NETIF_F_ALL_FOR_ALL;









	features = netdev_base_features(features);



















	bond_for_each_slave(bond, slave, iter) {









		features = netdev_increment_features(features,








@@ -1536,6 +1534,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev,

















#define BOND_VLAN_FEATURES	(NETIF_F_HW_CSUM | NETIF_F_SG | \









				 NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | \









				 NETIF_F_GSO_ENCAP_ALL | \









				 NETIF_F_HIGHDMA | NETIF_F_LRO)



















#define BOND_ENC_FEATURES	(NETIF_F_HW_CSUM | NETIF_F_SG | \








@@ -1565,8 +1564,9 @@ static void bond_compute_features(struct bonding *bond)

















	if (!bond_has_slaves(bond))









		goto done;









	vlan_features &= NETIF_F_ALL_FOR_ALL;









	mpls_features &= NETIF_F_ALL_FOR_ALL;



















	vlan_features = netdev_base_features(vlan_features);









	mpls_features = netdev_base_features(mpls_features);



















	bond_for_each_slave(bond, slave, iter) {









		vlan_features = netdev_increment_features(vlan_features,
































drivers/net/dsa/microchip/ksz_common.c



+18
−24






























Original line number
Diff line number
Diff line







@@ -1100,10 +1100,9 @@ static const struct regmap_range ksz9896_valid_regs[] = {







	regmap_reg_range(0x1030, 0x1030),









	regmap_reg_range(0x1100, 0x1115),









	regmap_reg_range(0x111a, 0x111f),









	regmap_reg_range(0x1122, 0x1127),









	regmap_reg_range(0x112a, 0x112b),









	regmap_reg_range(0x1136, 0x1139),









	regmap_reg_range(0x113e, 0x113f),









	regmap_reg_range(0x1120, 0x112b),









	regmap_reg_range(0x1134, 0x113b),









	regmap_reg_range(0x113c, 0x113f),









	regmap_reg_range(0x1400, 0x1401),









	regmap_reg_range(0x1403, 0x1403),









	regmap_reg_range(0x1410, 0x1417),








@@ -1130,10 +1129,9 @@ static const struct regmap_range ksz9896_valid_regs[] = {







	regmap_reg_range(0x2030, 0x2030),









	regmap_reg_range(0x2100, 0x2115),









	regmap_reg_range(0x211a, 0x211f),









	regmap_reg_range(0x2122, 0x2127),









	regmap_reg_range(0x212a, 0x212b),









	regmap_reg_range(0x2136, 0x2139),









	regmap_reg_range(0x213e, 0x213f),









	regmap_reg_range(0x2120, 0x212b),









	regmap_reg_range(0x2134, 0x213b),









	regmap_reg_range(0x213c, 0x213f),









	regmap_reg_range(0x2400, 0x2401),









	regmap_reg_range(0x2403, 0x2403),









	regmap_reg_range(0x2410, 0x2417),








@@ -1160,10 +1158,9 @@ static const struct regmap_range ksz9896_valid_regs[] = {







	regmap_reg_range(0x3030, 0x3030),









	regmap_reg_range(0x3100, 0x3115),









	regmap_reg_range(0x311a, 0x311f),









	regmap_reg_range(0x3122, 0x3127),









	regmap_reg_range(0x312a, 0x312b),









	regmap_reg_range(0x3136, 0x3139),









	regmap_reg_range(0x313e, 0x313f),









	regmap_reg_range(0x3120, 0x312b),









	regmap_reg_range(0x3134, 0x313b),









	regmap_reg_range(0x313c, 0x313f),









	regmap_reg_range(0x3400, 0x3401),









	regmap_reg_range(0x3403, 0x3403),









	regmap_reg_range(0x3410, 0x3417),








@@ -1190,10 +1187,9 @@ static const struct regmap_range ksz9896_valid_regs[] = {







	regmap_reg_range(0x4030, 0x4030),









	regmap_reg_range(0x4100, 0x4115),









	regmap_reg_range(0x411a, 0x411f),









	regmap_reg_range(0x4122, 0x4127),









	regmap_reg_range(0x412a, 0x412b),









	regmap_reg_range(0x4136, 0x4139),









	regmap_reg_range(0x413e, 0x413f),









	regmap_reg_range(0x4120, 0x412b),









	regmap_reg_range(0x4134, 0x413b),









	regmap_reg_range(0x413c, 0x413f),









	regmap_reg_range(0x4400, 0x4401),









	regmap_reg_range(0x4403, 0x4403),









	regmap_reg_range(0x4410, 0x4417),








@@ -1220,10 +1216,9 @@ static const struct regmap_range ksz9896_valid_regs[] = {







	regmap_reg_range(0x5030, 0x5030),









	regmap_reg_range(0x5100, 0x5115),









	regmap_reg_range(0x511a, 0x511f),









	regmap_reg_range(0x5122, 0x5127),









	regmap_reg_range(0x512a, 0x512b),









	regmap_reg_range(0x5136, 0x5139),









	regmap_reg_range(0x513e, 0x513f),









	regmap_reg_range(0x5120, 0x512b),









	regmap_reg_range(0x5134, 0x513b),









	regmap_reg_range(0x513c, 0x513f),









	regmap_reg_range(0x5400, 0x5401),









	regmap_reg_range(0x5403, 0x5403),









	regmap_reg_range(0x5410, 0x5417),








@@ -1250,10 +1245,9 @@ static const struct regmap_range ksz9896_valid_regs[] = {







	regmap_reg_range(0x6030, 0x6030),









	regmap_reg_range(0x6100, 0x6115),









	regmap_reg_range(0x611a, 0x611f),









	regmap_reg_range(0x6122, 0x6127),









	regmap_reg_range(0x612a, 0x612b),









	regmap_reg_range(0x6136, 0x6139),









	regmap_reg_range(0x613e, 0x613f),









	regmap_reg_range(0x6120, 0x612b),









	regmap_reg_range(0x6134, 0x613b),









	regmap_reg_range(0x613c, 0x613f),









	regmap_reg_range(0x6300, 0x6301),









	regmap_reg_range(0x6400, 0x6401),









	regmap_reg_range(0x6403, 0x6403),