Commit c2933b2b authored Jan 30, 2025 by Linus Torvalds

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from IPSec, netfilter and Bluetooth.

  Nothing really stands out, but as usual there's a slight concentration
  of fixes for issues added in the last two weeks before the merge
  window, and driver bugs from 6.13 which tend to get discovered upon
  wider distribution.

  Current release - regressions:

   - net: revert RTNL changes in unregister_netdevice_many_notify()

   - Bluetooth: fix possible infinite recursion of btusb_reset

   - eth: adjust locking in some old drivers which protect their state
     with spinlocks to avoid sleeping in atomic; core protects netdev
     state with a mutex now

  Previous releases - regressions:

   - eth:
      - mlx5e: make sure we pass node ID, not CPU ID to kvzalloc_node()
      - bgmac: reduce max frame size to support just 1500 bytes; the
        jumbo frame support would previously cause OOB writes, but now
        fails outright

   - mptcp: blackhole only if 1st SYN retrans w/o MPC is accepted, avoid
     false detection of MPTCP blackholing

  Previous releases - always broken:

   - mptcp: handle fastopen disconnect correctly

   - xfrm:
      - make sure skb->sk is a full sock before accessing its fields
      - fix taking a lock with preempt disabled for RT kernels

   - usb: ipheth: improve safety of packet metadata parsing; prevent
     potential OOB accesses

   - eth: renesas: fix missing rtnl lock in suspend/resume path"

* tag 'net-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (88 commits)
  MAINTAINERS: add Neal to TCP maintainers
  net: revert RTNL changes in unregister_netdevice_many_notify()
  net: hsr: fix fill_frame_info() regression vs VLAN packets
  doc: mptcp: sysctl: blackhole_timeout is per-netns
  mptcp: blackhole only if 1st SYN retrans w/o MPC is accepted
  netfilter: nf_tables: reject mismatching sum of field_len with set key length
  net: sh_eth: Fix missing rtnl lock in suspend/resume path
  net: ravb: Fix missing rtnl lock in suspend/resume path
  selftests/net: Add test for loading devbound XDP program in generic mode
  net: xdp: Disallow attaching device-bound programs in generic mode
  tcp: correct handling of extreme memory squeeze
  bgmac: reduce max frame size to support just MTU 1500
  vsock/test: Add test for connect() retries
  vsock/test: Add test for UAF due to socket unbinding
  vsock/test: Introduce vsock_connect_fd()
  vsock/test: Introduce vsock_bind()
  vsock: Allow retrying on connect() failure
  vsock: Keep the binding until socket destruction
  Bluetooth: L2CAP: accept zero as a special value for MTU auto-selection
  Bluetooth: btnxpuart: Fix glitches seen in dual A2DP streaming
  ...

parents b4b08811 dfffaccf

Documentation/ABI/stable/sysfs-class-bluetooth

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		What: /sys/class/bluetooth/hci<index>/reset
		Date: 14-Jan-2025
		KernelVersion: 6.13
		Contact: linux-bluetooth@vger.kernel.org
		Description: This write-only attribute allows users to trigger the vendor reset
		method on the Bluetooth device when arbitrary data is written.
		The reset may or may not be done through the device transport
		(e.g., UART/USB), and can also be done through an out-of-band
		approach such as GPIO.

Documentation/devicetree/bindings/net/qcom,ethqos.yaml

+4 −4

Original line number	Diff line number	Diff line
		@@ -22,12 +22,12 @@ properties:
		oneOf:
		- items:
		- enum:
		- qcom,qcs8300-ethqos
		- const: qcom,sa8775p-ethqos
		- qcom,qcs615-ethqos
		- const: qcom,qcs404-ethqos
		- items:
		- enum:
		- qcom,qcs615-ethqos
		- const: qcom,sm8150-ethqos
		- qcom,qcs8300-ethqos
		- const: qcom,sa8775p-ethqos
		- enum:
		- qcom,qcs404-ethqos
		- qcom,sa8775p-ethqos

Documentation/networking/can.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -699,10 +699,10 @@ RAW socket option CAN_RAW_JOIN_FILTERS

		The CAN_RAW socket can set multiple CAN identifier specific filters that
		lead to multiple filters in the af_can.c filter processing. These filters
		are indenpendent from each other which leads to logical OR'ed filters when
		are independent from each other which leads to logical OR'ed filters when
		applied (see :ref:`socketcan-rawfilter`).

		This socket option joines the given CAN filters in the way that only CAN
		This socket option joins the given CAN filters in the way that only CAN
		frames are passed to user space that matched all given CAN filters. The
		semantic for the applied filters is therefore changed to a logical AND.

Documentation/networking/mptcp-sysctl.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ blackhole_timeout - INTEGER (seconds)
		MPTCP is re-enabled and will reset to the initial value when the
		blackhole issue goes away.

		0 to disable the blackhole detection.
		0 to disable the blackhole detection. This is a per-namespace sysctl.

		Default: 3600

Documentation/networking/napi.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -362,7 +362,7 @@ It is expected that ``irq-suspend-timeout`` will be set to a value much larger
		than ``gro_flush_timeout`` as ``irq-suspend-timeout`` should suspend IRQs for
		the duration of one userland processing cycle.

		While it is not stricly necessary to use ``napi_defer_hard_irqs`` and
		While it is not strictly necessary to use ``napi_defer_hard_irqs`` and
		``gro_flush_timeout`` to use IRQ suspension, their use is strongly
		recommended.