Commit 57f1f9dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Current release - regressions:

   - eth: r8169: multiple fixes for PCIe ASPM-related problems

   - vrf: fix RCU lockdep splat in output path

  Previous releases - regressions:

   - gso: fall back to SW segmenting with GSO_UDP_L4 dodgy bit set

   - dsa: mv88e6xxx: do a final check before timing out when polling

   - nf_tables: fix sleep in atomic in nft_chain_validate

  Previous releases - always broken:

   - sched: fix undoing tcf_bind_filter() in multiple classifiers

   - bpf, arm64: fix BTI type used for freplace attached functions

   - can: gs_usb: fix time stamp counter initialization

   - nft_set_pipapo: fix improper element removal (leading to UAF)

  Misc:

   - net: support STP on bridge in non-root netns, STP prevents packet
     loops so not supporting it results in freezing systems of
     unsuspecting users, and in turn very upset noises being made

   - fix kdoc warnings

   - annotate various bits of TCP state to prevent data races"

* tag 'net-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (95 commits)
  net: phy: prevent stale pointer dereference in phy_init()
  tcp: annotate data-races around fastopenq.max_qlen
  tcp: annotate data-races around icsk->icsk_user_timeout
  tcp: annotate data-races around tp->notsent_lowat
  tcp: annotate data-races around rskq_defer_accept
  tcp: annotate data-races around tp->linger2
  tcp: annotate data-races around icsk->icsk_syn_retries
  tcp: annotate data-races around tp->keepalive_probes
  tcp: annotate data-races around tp->keepalive_intvl
  tcp: annotate data-races around tp->keepalive_time
  tcp: annotate data-races around tp->tsoffset
  tcp: annotate data-races around tp->tcp_tx_delay
  Bluetooth: MGMT: Use correct address for memcpy()
  Bluetooth: btusb: Fix bluetooth on Intel Macbook 2014
  Bluetooth: SCO: fix sco_conn related locking and validity issues
  Bluetooth: hci_conn: return ERR_PTR instead of NULL when there is no link
  Bluetooth: hci_sync: Avoid use-after-free in dbg for hci_remove_adv_monitor()
  Bluetooth: coredump: fix building with coredump disabled
  Bluetooth: ISO: fix iso_conn related locking and validity issues
  Bluetooth: hci_event: call disconnect callback before deleting conn
  ...
parents e599e16c 75d42b35

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ 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 Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>
@@ -454,6 +455,8 @@ Sebastian Reichel <sre@kernel.org> <sre@debian.org> 
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>

Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

arch/arm64/net/bpf_jit_comp.c

+7 −1
Original line number Diff line number Diff line
@@ -322,7 +322,13 @@ static int build_prologue(struct jit_ctx *ctx, bool ebpf_from_cbpf) 
	 *

	 */



	emit_bti(A64_BTI_C, ctx);

	/* bpf function may be invoked by 3 instruction types:

	 * 1. bl, attached via freplace to bpf prog via short jump

	 * 2. br, attached via freplace to bpf prog via long jump

	 * 3. blr, working as a function pointer, used by emit_call.

	 * So BTI_JC should used here to support both br and blr.

	 */

	emit_bti(A64_BTI_JC, ctx);



	emit(A64_MOV(1, A64_R(9), A64_LR), ctx);

	emit(A64_NOP, ctx);

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -4104,6 +4104,7 @@ static int btusb_probe(struct usb_interface *intf, 
	BT_DBG("intf %p id %p", intf, id);



	if ((id->driver_info & BTUSB_IFNUM_2) &&

	    (intf->cur_altsetting->desc.bInterfaceNumber != 0) &&

	    (intf->cur_altsetting->desc.bInterfaceNumber != 2))

		return -ENODEV;

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

+8 −2
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ static int 
__mcp251xfd_chip_set_mode(const struct mcp251xfd_priv *priv,

			  const u8 mode_req, bool nowait)

{

	const struct can_bittiming *bt = &priv->can.bittiming;

	unsigned long timeout_us = MCP251XFD_POLL_TIMEOUT_US;

	u32 con = 0, con_reqop, osc = 0;

	u8 mode;

	int err;
@@ -246,12 +248,16 @@ __mcp251xfd_chip_set_mode(const struct mcp251xfd_priv *priv, 
	if (mode_req == MCP251XFD_REG_CON_MODE_SLEEP || nowait)

		return 0;



	if (bt->bitrate)

		timeout_us = max_t(unsigned long, timeout_us,

				   MCP251XFD_FRAME_LEN_MAX_BITS * USEC_PER_SEC /

				   bt->bitrate);



	err = regmap_read_poll_timeout(priv->map_reg, MCP251XFD_REG_CON, con,

				       !mcp251xfd_reg_invalid(con) &&

				       FIELD_GET(MCP251XFD_REG_CON_OPMOD_MASK,

						 con) == mode_req,

				       MCP251XFD_POLL_SLEEP_US,

				       MCP251XFD_POLL_TIMEOUT_US);

				       MCP251XFD_POLL_SLEEP_US, timeout_us);

	if (err != -ETIMEDOUT && err != -EBADMSG)

		return err;

drivers/net/can/spi/mcp251xfd/mcp251xfd.h

+1 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ static_assert(MCP251XFD_TIMESTAMP_WORK_DELAY_SEC < 
#define MCP251XFD_OSC_STAB_TIMEOUT_US (10 * MCP251XFD_OSC_STAB_SLEEP_US)

#define MCP251XFD_POLL_SLEEP_US (10)

#define MCP251XFD_POLL_TIMEOUT_US (USEC_PER_MSEC)

#define MCP251XFD_FRAME_LEN_MAX_BITS (736)



/* Misc */

#define MCP251XFD_NAPI_WEIGHT 32