Commit edb9b8f3 authored Feb 02, 2023 by Linus Torvalds

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

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

  Current release - regressions:

   - phy: fix null-deref in phy_attach_direct

   - mac802154: fix possible double free upon parsing error

  Previous releases - regressions:

   - bpf: preserve reg parent/live fields when copying range info,
     prevent mis-verification of programs as safe

   - ip6: fix GRE tunnels not generating IPv6 link local addresses

   - phy: dp83822: fix null-deref on DP83825/DP83826 devices

   - sctp: do not check hb_timer.expires when resetting hb_timer

   - eth: mtk_sock: fix SGMII configuration after phylink conversion

  Previous releases - always broken:

   - eth: xdp: execute xdp_do_flush() before napi_complete_done()

   - skb: do not mix page pool and page referenced frags in GRO

   - bpf:
      - fix a possible task gone issue with bpf_send_signal[_thread]()
      - fix an off-by-one bug in bpf_mem_cache_idx() to select the right
        cache
      - add missing btf_put to register_btf_id_dtor_kfuncs
      - sockmap: fon't let sock_map_{close,destroy,unhash} call itself

   - gso: fix null-deref in skb_segment_list()

   - mctp: purge receive queues on sk destruction

   - fix UaF caused by accept on already connected socket in exotic
     socket families

   - tls: don't treat list head as an entry in tls_is_tx_ready()

   - netfilter: br_netfilter: disable sabotage_in hook after first
     suppression

   - wwan: t7xx: fix runtime PM implementation

  Misc:

   - MAINTAINERS: spring cleanup of networking maintainers"

* tag 'net-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (65 commits)
  mtk_sgmii: enable PCS polling to allow SFP work
  net: mediatek: sgmii: fix duplex configuration
  net: mediatek: sgmii: ensure the SGMII PHY is powered down on configuration
  MAINTAINERS: update SCTP maintainers
  MAINTAINERS: ipv6: retire Hideaki Yoshifuji
  mailmap: add John Crispin's entry
  MAINTAINERS: bonding: move Veaceslav Falico to CREDITS
  net: openvswitch: fix flow memory leak in ovs_flow_cmd_new
  net: ethernet: mtk_eth_soc: disable hardware DSA untagging for second MAC
  virtio-net: Keep stop() to follow mirror sequence of open()
  selftests: net: udpgso_bench_tx: Cater for pending datagrams zerocopy benchmarking
  selftests: net: udpgso_bench: Fix racing bug between the rx/tx programs
  selftests: net: udpgso_bench_rx/tx: Stop when wrong CLI args are provided
  selftests: net: udpgso_bench_rx: Fix 'used uninitialized' compiler warning
  can: mcp251xfd: mcp251xfd_ring_set_ringparam(): assign missing tx_obj_num_coalesce_irq
  can: isotp: split tx timer into transmission and timeout
  can: isotp: handle wait_event_interruptible() return values
  can: raw: fix CAN FD frame transmissions over CAN XL devices
  can: j1939: fix errant WARN_ON_ONCE in j1939_session_deactivate
  hv_netvsc: Fix missed pagebuf entries in netvsc_dma_map/unmap()
  ...

parents e7368fd3 9983a2c9

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,7 @@ Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
		Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
		Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
		Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
		John Crispin <john@phrozen.org> <blogic@openwrt.org>
		John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
		John Stultz <johnstul@us.ibm.com>
		Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author)
		D: APM driver (early port)
		D: DRM drivers (author of several)

		N: Veaceslav Falico
		E: vfalico@gmail.com
		D: Co-maintainer and co-author of the network bonding driver.

		N: János Farkas
		E: chexum@shadow.banki.hu
		D: romfs, various (mostly networking) fixes
		@@ -4179,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu
		S: 16 Baliqiao Nanjie, Beijing 101100
		S: People's Repulic of China

		N: Vlad Yasevich
		E: vyasevich@gmail.com
		D: SCTP protocol maintainer.

		N: Aviad Yehezkel
		E: aviadye@nvidia.com
		D: Kernel TLS implementation and offload support.

Documentation/networking/device_drivers/ethernet/intel/ice.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -819,7 +819,7 @@ NAPI
		----
		This driver supports NAPI (Rx polling mode).
		For more information on NAPI, see
		https://www.linuxfoundation.org/collaborate/workgroups/networking/napi
		https://wiki.linuxfoundation.org/networking/napi


		MACVLAN

MAINTAINERS

+1 −3

Original line number	Diff line number	Diff line
		@@ -3771,7 +3771,6 @@ F: net/bluetooth/

		BONDING DRIVER
		M: Jay Vosburgh <j.vosburgh@gmail.com>
		M: Veaceslav Falico <vfalico@gmail.com>
		M: Andy Gospodarek <andy@greyhouse.net>
		L: netdev@vger.kernel.org
		S: Supported
		@@ -14609,7 +14608,6 @@ F: tools/testing/selftests/net/ipsec.c

		NETWORKING [IPv4/IPv6]
		M: "David S. Miller" <davem@davemloft.net>
		M: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
		M: David Ahern <dsahern@kernel.org>
		L: netdev@vger.kernel.org
		S: Maintained
		@@ -18692,9 +18690,9 @@ F: drivers/target/
		F: include/target/

		SCTP PROTOCOL
		M: Vlad Yasevich <vyasevich@gmail.com>
		M: Neil Horman <nhorman@tuxdriver.com>
		M: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
		M: Xin Long <lucien.xin@gmail.com>
		L: linux-sctp@vger.kernel.org
		S: Maintained
		W: http://lksctp.sourceforge.net

drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ mcp251xfd_ring_set_ringparam(struct net_device *ndev,
		priv->rx_obj_num = layout.cur_rx;
		priv->rx_obj_num_coalesce_irq = layout.rx_coalesce;
		priv->tx->obj_num = layout.cur_tx;
		priv->tx_obj_num_coalesce_irq = layout.tx_coalesce;

		return 0;
		}