Commit c7402612 authored Dec 14, 2023 by Linus Torvalds

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

Pull networking fixes from Paolo Abeni:
"Current release - regressions:

   - tcp: fix tcp_disordered_ack() vs usec TS resolution

  Current release - new code bugs:

   - dpll: sanitize possible null pointer dereference in
     dpll_pin_parent_pin_set()

   - eth: octeon_ep: initialise control mbox tasks before using APIs

  Previous releases - regressions:

   - io_uring/af_unix: disable sending io_uring over sockets

   - eth: mlx5e:
       - TC, don't offload post action rule if not supported
       - fix possible deadlock on mlx5e_tx_timeout_work

   - eth: iavf: fix iavf_shutdown to call iavf_remove instead iavf_close

   - eth: bnxt_en: fix skb recycling logic in bnxt_deliver_skb()

   - eth: ena: fix DMA syncing in XDP path when SWIOTLB is on

   - eth: team: fix use-after-free when an option instance allocation
     fails

  Previous releases - always broken:

   - neighbour: don't let neigh_forced_gc() disable preemption for long

   - net: prevent mss overflow in skb_segment()

   - ipv6: support reporting otherwise unknown prefix flags in
     RTM_NEWPREFIX

   - tcp: remove acked SYN flag from packet in the transmit queue
     correctly

   - eth: octeontx2-af:
       - fix a use-after-free in rvu_nix_register_reporters
       - fix promisc mcam entry action

   - eth: dwmac-loongson: make sure MDIO is initialized before use

   - eth: atlantic: fix double free in ring reinit logic"

* tag 'net-6.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (62 commits)
  net: atlantic: fix double free in ring reinit logic
  appletalk: Fix Use-After-Free in atalk_ioctl
  net: stmmac: Handle disabled MDIO busses from devicetree
  net: stmmac: dwmac-qcom-ethqos: Fix drops in 10M SGMII RX
  dpaa2-switch: do not ask for MDB, VLAN and FDB replay
  dpaa2-switch: fix size of the dma_unmap
  net: prevent mss overflow in skb_segment()
  vsock/virtio: Fix unsigned integer wrap around in virtio_transport_has_space()
  Revert "tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set"
  MIPS: dts: loongson: drop incorrect dwmac fallback compatible
  stmmac: dwmac-loongson: drop useless check for compatible fallback
  stmmac: dwmac-loongson: Make sure MDIO is initialized before use
  tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set
  dpll: sanitize possible null pointer dereference in dpll_pin_parent_pin_set()
  net: ena: Fix XDP redirection error
  net: ena: Fix DMA syncing in XDP path when SWIOTLB is on
  net: ena: Fix xdp drops handling due to multibuf packets
  net: ena: Destroy correct number of xdp queues upon failure
  net: Remove acked SYN flag from packet in the transmit queue correctly
  qed: Fix a potential use-after-free in qed_cxt_tables_alloc
  ...

parents bdb2701f 7bb26ea7

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -19564,7 +19564,6 @@ S: Maintained
		F: drivers/misc/sgi-xp/

		SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
		M: Karsten Graul <kgraul@linux.ibm.com>
		M: Wenjia Zhang <wenjia@linux.ibm.com>
		M: Jan Karcher <jaka@linux.ibm.com>
		R: D. Wythe <alibuda@linux.alibaba.com>

arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi

+1 −2

Original line number	Diff line number	Diff line
		@@ -130,8 +130,7 @@ gmac@3,0 {
		compatible = "pci0014,7a03.0",
		"pci0014,7a03",
		"pciclass0c0320",
		"pciclass0c03",
		"loongson, pci-gmac";
		"pciclass0c03";

		reg = <0x1800 0x0 0x0 0x0 0x0>;
		interrupts = <12 IRQ_TYPE_LEVEL_LOW>,

arch/mips/boot/dts/loongson/ls7a-pch.dtsi

+1 −2

Original line number	Diff line number	Diff line
		@@ -193,8 +193,7 @@ gmac@3,0 {
		compatible = "pci0014,7a03.0",
		"pci0014,7a03",
		"pciclass020000",
		"pciclass0200",
		"loongson, pci-gmac";
		"pciclass0200";

		reg = <0x1800 0x0 0x0 0x0 0x0>;
		interrupts = <12 IRQ_TYPE_LEVEL_HIGH>,

drivers/atm/solos-pci.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -449,9 +449,9 @@ static ssize_t console_show(struct device dev, struct device_attribute attr,
		struct sk_buff *skb;
		unsigned int len;

		spin_lock(&card->cli_queue_lock);
		spin_lock_bh(&card->cli_queue_lock);
		skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]);
		spin_unlock(&card->cli_queue_lock);
		spin_unlock_bh(&card->cli_queue_lock);
		if(skb == NULL)
		return sprintf(buf, "No data.\n");

		@@ -956,14 +956,14 @@ static void pclose(struct atm_vcc *vcc)
		struct pkt_hdr *header;

		/* Remove any yet-to-be-transmitted packets from the pending queue */
		spin_lock(&card->tx_queue_lock);
		spin_lock_bh(&card->tx_queue_lock);
		skb_queue_walk_safe(&card->tx_queue[port], skb, tmpskb) {
		if (SKB_CB(skb)->vcc == vcc) {
		skb_unlink(skb, &card->tx_queue[port]);
		solos_pop(vcc, skb);
		}
		}
		spin_unlock(&card->tx_queue_lock);
		spin_unlock_bh(&card->tx_queue_lock);

		skb = alloc_skb(sizeof(*header), GFP_KERNEL);
		if (!skb) {

drivers/dpll/dpll_netlink.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -925,7 +925,6 @@ dpll_pin_parent_pin_set(struct dpll_pin pin, struct nlattr parent_nest,
		struct netlink_ext_ack *extack)
		{
		struct nlattr *tb[DPLL_A_PIN_MAX + 1];
		enum dpll_pin_state state;
		u32 ppin_idx;
		int ret;

		@@ -936,10 +935,14 @@ dpll_pin_parent_pin_set(struct dpll_pin pin, struct nlattr parent_nest,
		return -EINVAL;
		}
		ppin_idx = nla_get_u32(tb[DPLL_A_PIN_PARENT_ID]);
		state = nla_get_u32(tb[DPLL_A_PIN_STATE]);

		if (tb[DPLL_A_PIN_STATE]) {
		enum dpll_pin_state state = nla_get_u32(tb[DPLL_A_PIN_STATE]);

		ret = dpll_pin_on_pin_state_set(pin, ppin_idx, state, extack);
		if (ret)
		return ret;
		}

		return 0;
		}