Commit 25041a4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from can, wifi, netfilter, bluetooth and ebpf.

  Current release - regressions:

   - bpf: sockmap: avoid potential NULL dereference in
     sk_psock_verdict_data_ready()

   - wifi: iwlwifi: fix -Warray-bounds bug in iwl_mvm_wait_d3_notif()

   - phylink: actually fix ksettings_set() ethtool call

   - eth: dwmac-qcom-ethqos: fix a regression on EMAC < 3

  Current release - new code bugs:

   - wifi: mt76: fix possible NULL pointer dereference in
     mt7996_mac_write_txwi()

  Previous releases - regressions:

   - netfilter: fix NULL pointer dereference in nf_confirm_cthelper

   - wifi: rtw88/rtw89: correct PS calculation for SUPPORTS_DYNAMIC_PS

   - openvswitch: fix upcall counter access before allocation

   - bluetooth:
      - fix use-after-free in hci_remove_ltk/hci_remove_irk
      - fix l2cap_disconnect_req deadlock

   - nic: bnxt_en: prevent kernel panic when receiving unexpected
     PHC_UPDATE event

  Previous releases - always broken:

   - core: annotate rfs lockless accesses

   - sched: fq_pie: ensure reasonable TCA_FQ_PIE_QUANTUM values

   - netfilter: add null check for nla_nest_start_noflag() in
     nft_dump_basechain_hook()

   - bpf: fix UAF in task local storage

   - ipv4: ping_group_range: allow GID from 2147483648 to 4294967294

   - ipv6: rpl: fix route of death.

   - tcp: gso: really support BIG TCP

   - mptcp: fixes for user-space PM address advertisement

   - smc: avoid to access invalid RMBs' MRs in SMCRv1 ADD LINK CONT

   - can: avoid possible use-after-free when j1939_can_rx_register fails

   - batman-adv: fix UaF while rescheduling delayed work

   - eth: qede: fix scheduling while atomic

   - eth: ice: make writes to /dev/gnssX synchronous"

* tag 'net-6.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (83 commits)
  bnxt_en: Implement .set_port / .unset_port UDP tunnel callbacks
  bnxt_en: Prevent kernel panic when receiving unexpected PHC_UPDATE event
  bnxt_en: Skip firmware fatal error recovery if chip is not accessible
  bnxt_en: Query default VLAN before VNIC setup on a VF
  bnxt_en: Don't issue AP reset during ethtool's reset operation
  bnxt_en: Fix bnxt_hwrm_update_rss_hash_cfg()
  net: bcmgenet: Fix EEE implementation
  eth: ixgbe: fix the wake condition
  eth: bnxt: fix the wake condition
  lib: cpu_rmap: Fix potential use-after-free in irq_cpu_rmap_release()
  bpf: Add extra path pointer check to d_path helper
  net: sched: fix possible refcount leak in tc_chain_tmplt_add()
  net: sched: act_police: fix sparse errors in tcf_police_dump()
  net: openvswitch: fix upcall counter access before allocation
  net: sched: move rtm_tca_policy declaration to include file
  ice: make writes to /dev/gnssX synchronous
  net: sched: add rcu annotations around qdisc->qdisc_sleeping
  rfs: annotate lockless accesses to RFS sock flow table
  rfs: annotate lockless accesses to sk->sk_rxhash
  virtio_net: use control_buf for coalesce params
  ...
parents 79b6fad5 6c0ec7ab

Documentation/netlink/specs/ethtool.yaml

+16 −16
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ attribute-sets: 
        name: tx-min-frag-size

        type: u32

      -

        name: tx-min-frag-size

        name: rx-min-frag-size

        type: u32

      -

        name: verify-enabled
@@ -294,7 +294,7 @@ attribute-sets: 
        name: master-slave-state

        type: u8

      -

        name: master-slave-lanes

        name: lanes

        type: u32

      -

        name: rate-matching
@@ -322,7 +322,7 @@ attribute-sets: 
        name: ext-substate

        type: u8

      -

        name: down-cnt

        name: ext-down-cnt

        type: u32

  -

    name: debug
@@ -577,7 +577,7 @@ attribute-sets: 
        name: phc-index

        type: u32

  -

    name: cable-test-nft-nest-result

    name: cable-test-ntf-nest-result

    attributes:

      -

        name: pair
@@ -586,7 +586,7 @@ attribute-sets: 
        name: code

        type: u8

  -

    name: cable-test-nft-nest-fault-length

    name: cable-test-ntf-nest-fault-length

    attributes:

      -

        name: pair
@@ -595,16 +595,16 @@ attribute-sets: 
        name: cm

        type: u32

  -

    name: cable-test-nft-nest

    name: cable-test-ntf-nest

    attributes:

      -

        name: result

        type: nest

        nested-attributes: cable-test-nft-nest-result

        nested-attributes: cable-test-ntf-nest-result

      -

        name: fault-length

        type: nest

        nested-attributes: cable-test-nft-nest-fault-length

        nested-attributes: cable-test-ntf-nest-fault-length

  -

    name: cable-test

    attributes:
@@ -618,7 +618,7 @@ attribute-sets: 
      -

        name: nest

        type: nest

        nested-attributes: cable-test-nft-nest

        nested-attributes: cable-test-ntf-nest

  -

    name: cable-test-tdr-cfg

    attributes:
@@ -776,7 +776,7 @@ attribute-sets: 
        name: hist-bkt-hi

        type: u32

      -

        name: hist-bkt-val

        name: hist-val

        type: u64

  -

    name: stats
@@ -965,7 +965,7 @@ operations: 
            - duplex

            - master-slave-cfg

            - master-slave-state

            - master-slave-lanes

            - lanes

            - rate-matching

      dump: *linkmodes-get-op

    -
@@ -999,7 +999,7 @@ operations: 
            - sqi-max

            - ext-state

            - ext-substate

            - down-cnt

            - ext-down-cnt

      dump: *linkstate-get-op

    -

      name: debug-get
@@ -1351,7 +1351,7 @@ operations: 
        reply:

          attributes:

            - header

            - cable-test-nft-nest

            - cable-test-ntf-nest

    -

      name: cable-test-tdr-act

      doc: Cable test TDR.
@@ -1539,7 +1539,7 @@ operations: 
            - hkey

      dump: *rss-get-op

    -

      name: plca-get

      name: plca-get-cfg

      doc: Get PLCA params.



      attribute-set: plca
@@ -1561,7 +1561,7 @@ operations: 
            - burst-tmr

      dump: *plca-get-op

    -

      name: plca-set

      name: plca-set-cfg

      doc: Set PLCA params.



      attribute-set: plca
@@ -1585,7 +1585,7 @@ operations: 
    -

      name: plca-ntf

      doc: Notification for change in PLCA params.

      notify: plca-get

      notify: plca-get-cfg

    -

      name: mm-get

      doc: Get MAC Merge configuration and state

Documentation/networking/ip-sysctl.rst

+2 −2
Original line number Diff line number Diff line
@@ -1352,8 +1352,8 @@ ping_group_range - 2 INTEGERS 
	Restrict ICMP_PROTO datagram sockets to users in the group range.

	The default is "1 0", meaning, that nobody (not even root) may

	create ping sockets.  Setting it to "100 100" would grant permissions

	to the single group. "0 4294967295" would enable it for the world, "100

	4294967295" would enable it for the users, but not daemons.

	to the single group. "0 4294967294" would enable it for the world, "100

	4294967294" would enable it for the users, but not daemons.



tcp_early_demux - BOOLEAN

	Enable early demux for established TCP sockets.

drivers/bluetooth/hci_qca.c

+5 −1
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ enum qca_flags { 
	QCA_HW_ERROR_EVENT,

	QCA_SSR_TRIGGERED,

	QCA_BT_OFF,

	QCA_ROM_FW

	QCA_ROM_FW,

	QCA_DEBUGFS_CREATED,

};



enum qca_capabilities {
@@ -635,6 +636,9 @@ static void qca_debugfs_init(struct hci_dev *hdev) 
	if (!hdev->debugfs)

		return;



	if (test_and_set_bit(QCA_DEBUGFS_CREATED, &qca->flags))

		return;



	ibs_dir = debugfs_create_dir("ibs", hdev->debugfs);



	/* read only */

drivers/net/dsa/lan9303-core.c

+0 −4
Original line number Diff line number Diff line
@@ -1188,8 +1188,6 @@ static int lan9303_port_fdb_add(struct dsa_switch *ds, int port, 
	struct lan9303 *chip = ds->priv;



	dev_dbg(chip->dev, "%s(%d, %pM, %d)\n", __func__, port, addr, vid);

	if (vid)

		return -EOPNOTSUPP;



	return lan9303_alr_add_port(chip, addr, port, false);

}
@@ -1201,8 +1199,6 @@ static int lan9303_port_fdb_del(struct dsa_switch *ds, int port, 
	struct lan9303 *chip = ds->priv;



	dev_dbg(chip->dev, "%s(%d, %pM, %d)\n", __func__, port, addr, vid);

	if (vid)

		return -EOPNOTSUPP;

	lan9303_alr_del_port(chip, addr, port);



	return 0;

drivers/net/dsa/qca/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config NET_DSA_QCA8K_LEDS_SUPPORT 
	bool "Qualcomm Atheros QCA8K Ethernet switch family LEDs support"

	depends on NET_DSA_QCA8K

	depends on LEDS_CLASS=y || LEDS_CLASS=NET_DSA_QCA8K

	depends on LEDS_TRIGGERS

	help

	  This enabled support for LEDs present on the Qualcomm Atheros

	  QCA8K Ethernet switch chips.