Commit c7d10223 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Networking fixes for 5.14-rc4, including fixes from bpf, can, WiFi
  (mac80211) and netfilter trees.

  Current release - regressions:

   - mac80211: fix starting aggregation sessions on mesh interfaces

  Current release - new code bugs:

   - sctp: send pmtu probe only if packet loss in Search Complete state

   - bnxt_en: add missing periodic PHC overflow check

   - devlink: fix phys_port_name of virtual port and merge error

   - hns3: change the method of obtaining default ptp cycle

   - can: mcba_usb_start(): add missing urb->transfer_dma initialization

  Previous releases - regressions:

   - set true network header for ECN decapsulation

   - mlx5e: RX, avoid possible data corruption w/ relaxed ordering and
     LRO

   - phy: re-add check for PHY_BRCM_DIS_TXCRXC_NOENRGY on the BCM54811
     PHY

   - sctp: fix return value check in __sctp_rcv_asconf_lookup

  Previous releases - always broken:

   - bpf:
       - more spectre corner case fixes, introduce a BPF nospec
         instruction for mitigating Spectre v4
       - fix OOB read when printing XDP link fdinfo
       - sockmap: fix cleanup related races

   - mac80211: fix enabling 4-address mode on a sta vif after assoc

   - can:
       - raw: raw_setsockopt(): fix raw_rcv panic for sock UAF
       - j1939: j1939_session_deactivate(): clarify lifetime of session
         object, avoid UAF
       - fix number of identical memory leaks in USB drivers

   - tipc:
       - do not blindly write skb_shinfo frags when doing decryption
       - fix sleeping in tipc accept routine"

* tag 'net-5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (91 commits)
  gve: Update MAINTAINERS list
  can: esd_usb2: fix memory leak
  can: ems_usb: fix memory leak
  can: usb_8dev: fix memory leak
  can: mcba_usb_start(): add missing urb->transfer_dma initialization
  can: hi311x: fix a signedness bug in hi3110_cmd()
  MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver
  bpf: Fix leakage due to insufficient speculative store bypass mitigation
  bpf: Introduce BPF nospec instruction for mitigating Spectre v4
  sis900: Fix missing pci_disable_device() in probe and remove
  net: let flow have same hash in two directions
  nfc: nfcsim: fix use after free during module unload
  tulip: windbond-840: Fix missing pci_disable_device() in probe and remove
  sctp: fix return value check in __sctp_rcv_asconf_lookup
  nfc: s3fwrn5: fix undefined parameter values in dev_err()
  net/mlx5: Fix mlx5_vport_tbl_attr chain from u16 to u32
  net/mlx5e: Fix nullptr in mlx5e_hairpin_get_mdev()
  net/mlx5: Unload device upon firmware fatal error
  net/mlx5e: Fix page allocation failure for ptp-RQ over SF
  net/mlx5e: Fix page allocation failure for trap-RQ over SF
  ...
parents e1dab4c0 8d670412

MAINTAINERS

+9 −3
Original line number Diff line number Diff line
@@ -7858,9 +7858,9 @@ S: Maintained 
F:	drivers/input/touchscreen/goodix.c









GOOGLE ETHERNET DRIVERS









M:	Catherine Sullivan <csully@google.com>









R:	Sagi Shahar <sagis@google.com>









R:	Jon Olson <jonolson@google.com>









M:	Jeroen de Borst <jeroendb@google.com>









R:	Catherine Sullivan <csully@google.com>









R:	David Awogbemila <awogbemila@google.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	Documentation/networking/device_drivers/ethernet/google/gve.rst








@@ -11327,6 +11327,12 @@ W:	https://linuxtv.org







T:	git git://linuxtv.org/media_tree.git









F:	drivers/media/radio/radio-maxiradio*

















MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER









R:	Yasushi SHOJI <yashi@spacecubics.com>









L:	linux-can@vger.kernel.org









S:	Maintained









F:	drivers/net/can/usb/mcba_usb.c

















MCAN MMIO DEVICE DRIVER









M:	Chandrasekar Ramakrishnan <rcsekar@samsung.com>









L:	linux-can@vger.kernel.org
































arch/arm/net/bpf_jit_32.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -1602,6 +1602,9 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)







		rn = arm_bpf_get_reg32(src_lo, tmp2[1], ctx);









		emit_ldx_r(dst, rn, off, ctx, BPF_SIZE(code));









		break;









	/* speculation barrier */









	case BPF_ST | BPF_NOSPEC:









		break;









	/* ST: *(size *)(dst + off) = imm */









	case BPF_ST | BPF_MEM | BPF_W:









	case BPF_ST | BPF_MEM | BPF_H:
































arch/arm64/boot/dts/freescale/imx8mp.dtsi



+2
−2






























Original line number
Diff line number
Diff line







@@ -579,7 +579,7 @@







			};



















			flexcan1: can@308c0000 {









				compatible = "fsl,imx8mp-flexcan", "fsl,imx6q-flexcan";









				compatible = "fsl,imx8mp-flexcan";









				reg = <0x308c0000 0x10000>;









				interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;









				clocks = <&clk IMX8MP_CLK_IPG_ROOT>,








@@ -594,7 +594,7 @@







			};



















			flexcan2: can@308d0000 {









				compatible = "fsl,imx8mp-flexcan", "fsl,imx6q-flexcan";









				compatible = "fsl,imx8mp-flexcan";









				reg = <0x308d0000 0x10000>;









				interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;









				clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
































arch/arm64/net/bpf_jit_comp.c



+13
−0






























Original line number
Diff line number
Diff line







@@ -823,6 +823,19 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,







			return ret;









		break;



















	/* speculation barrier */









	case BPF_ST | BPF_NOSPEC:









		/*









		 * Nothing required here.









		 *









		 * In case of arm64, we rely on the firmware mitigation of









		 * Speculative Store Bypass as controlled via the ssbd kernel









		 * parameter. Whenever the mitigation is enabled, it works









		 * for all of the kernel code with no need to provide any









		 * additional instructions.









		 */









		break;



















	/* ST: *(size *)(dst + off) = imm */









	case BPF_ST | BPF_MEM | BPF_W:









	case BPF_ST | BPF_MEM | BPF_H:
































arch/mips/net/ebpf_jit.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -1355,6 +1355,9 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,







		}









		break;



















	case BPF_ST | BPF_NOSPEC: /* speculation barrier */









		break;



















	case BPF_ST | BPF_B | BPF_MEM:









	case BPF_ST | BPF_H | BPF_MEM:









	case BPF_ST | BPF_W | BPF_MEM: