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

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

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

  Current release - regressions:

   - virtio_net: avoid crash on resume - move netdev_tx_reset_queue()
     call before RX napi enable

  Current release - new code bugs:

   - net/mlx5e: fix page leak and incorrect header release w/ HW GRO

  Previous releases - regressions:

   - udp: fix receiving fraglist GSO packets

   - tcp: prevent refcount underflow due to concurrent execution of
     tcp_sk_exit_batch()

  Previous releases - always broken:

   - ipv6: fix possible UAF when incrementing error counters on output

   - ip6: tunnel: prevent merging of packets with different L2

   - mptcp: pm: fix IDs not being reusable

   - bonding: fix potential crashes in IPsec offload handling

   - Bluetooth: HCI:
      - MGMT: add error handling to pair_device() to avoid a crash
      - invert LE State quirk to be opt-out rather then opt-in
      - fix LE quote calculation

   - drv: dsa: VLAN fixes for Ocelot driver

   - drv: igb: cope with large MAX_SKB_FRAGS Kconfig settings

   - drv: ice: fi Rx data path on architectures with PAGE_SIZE >= 8192

  Misc:

   - netpoll: do not export netpoll_poll_[disable|enable]()

   - MAINTAINERS: update the list of networking headers"

* tag 'net-6.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (82 commits)
  s390/iucv: Fix vargs handling in iucv_alloc_device()
  net: ovs: fix ovs_drop_reasons error
  net: xilinx: axienet: Fix dangling multicast addresses
  net: xilinx: axienet: Always disable promiscuous mode
  MAINTAINERS: Mark JME Network Driver as Odd Fixes
  MAINTAINERS: Add header files to NETWORKING sections
  MAINTAINERS: Add limited globs for Networking headers
  MAINTAINERS: Add net_tstamp.h to SOCKET TIMESTAMPING section
  MAINTAINERS: Add sonet.h to ATM section of MAINTAINERS
  octeontx2-af: Fix CPT AF register offset calculation
  net: phy: realtek: Fix setting of PHY LEDs Mode B bit on RTL8211F
  net: ngbe: Fix phy mode set to external phy
  netfilter: flowtable: validate vlan header
  bnxt_en: Fix double DMA unmapping for XDP_REDIRECT
  ipv6: prevent possible UAF in ip6_xmit()
  ipv6: fix possible UAF in ip6_finish_output2()
  ipv6: prevent UAF in ip6_send_skb()
  netpoll: do not export netpoll_poll_[disable|enable]()
  selftests: mlxsw: ethtool_lanes: Source ethtool lib from correct path
  udp: fix receiving fraglist GSO packets
  ...
parents 3f44ae97 0124fb0e

MAINTAINERS

+27 −6
Original line number Diff line number Diff line
@@ -3504,7 +3504,9 @@ S: Maintained 
W:	http://linux-atm.sourceforge.net

F:	drivers/atm/

F:	include/linux/atm*

F:	include/linux/sonet.h

F:	include/uapi/linux/atm*

F:	include/uapi/linux/sonet.h









ATMEL MACB ETHERNET DRIVER









M:	Nicolas Ferre <nicolas.ferre@microchip.com>








@@ -11993,7 +11995,7 @@ F:	fs/jfs/







JME NETWORK DRIVER









M:	Guo-Fu Tseng <cooldavid@cooldavid.org>









L:	netdev@vger.kernel.org









S:	Maintained









S:	Odd Fixes









F:	drivers/net/ethernet/jme.*

















JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)








@@ -15877,15 +15879,19 @@ F:	drivers/net/







F:	include/dt-bindings/net/









F:	include/linux/cn_proc.h









F:	include/linux/etherdevice.h









F:	include/linux/ethtool_netlink.h









F:	include/linux/fcdevice.h









F:	include/linux/fddidevice.h









F:	include/linux/hippidevice.h









F:	include/linux/if_*









F:	include/linux/inetdevice.h









F:	include/linux/netdevice.h









F:	include/linux/netdev*









F:	include/linux/platform_data/wiznet.h









F:	include/uapi/linux/cn_proc.h









F:	include/uapi/linux/ethtool_netlink.h









F:	include/uapi/linux/if_*









F:	include/uapi/linux/netdevice.h









F:	include/uapi/linux/netdev*









F:	tools/testing/selftests/drivers/net/









X:	drivers/net/wireless/

















NETWORKING DRIVERS (WIRELESS)








@@ -15936,14 +15942,28 @@ F:	include/linux/framer/framer-provider.h







F:	include/linux/framer/framer.h









F:	include/linux/in.h









F:	include/linux/indirect_call_wrapper.h









F:	include/linux/inet.h









F:	include/linux/inet_diag.h









F:	include/linux/net.h









F:	include/linux/netdevice.h









F:	include/linux/skbuff.h









F:	include/linux/netdev*









F:	include/linux/netlink.h









F:	include/linux/netpoll.h









F:	include/linux/rtnetlink.h









F:	include/linux/seq_file_net.h









F:	include/linux/skbuff*









F:	include/net/









F:	include/uapi/linux/genetlink.h









F:	include/uapi/linux/hsr_netlink.h









F:	include/uapi/linux/in.h









F:	include/uapi/linux/inet_diag.h









F:	include/uapi/linux/nbd-netlink.h









F:	include/uapi/linux/net.h









F:	include/uapi/linux/net_namespace.h









F:	include/uapi/linux/netdevice.h









F:	include/uapi/linux/netconf.h









F:	include/uapi/linux/netdev*









F:	include/uapi/linux/netlink.h









F:	include/uapi/linux/netlink_diag.h









F:	include/uapi/linux/rtnetlink.h









F:	lib/net_utils.c









F:	lib/random32.c









F:	net/








@@ -21054,6 +21074,7 @@ SOCKET TIMESTAMPING







M:	Willem de Bruijn <willemdebruijn.kernel@gmail.com>









S:	Maintained









F:	Documentation/networking/timestamping.rst









F:	include/linux/net_tstamp.h









F:	include/uapi/linux/net_tstamp.h









F:	tools/testing/selftests/net/so_txtime.c

































drivers/bluetooth/btintel.c



+0
−10






























Original line number
Diff line number
Diff line







@@ -2945,9 +2945,6 @@ static int btintel_setup_combined(struct hci_dev *hdev)







					       INTEL_ROM_LEGACY_NO_WBS_SUPPORT))









				set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,









					&hdev->quirks);









			if (ver.hw_variant == 0x08 && ver.fw_variant == 0x22)









				set_bit(HCI_QUIRK_VALID_LE_STATES,









					&hdev->quirks);



















			err = btintel_legacy_rom_setup(hdev, &ver);









			break;








@@ -2956,7 +2953,6 @@ static int btintel_setup_combined(struct hci_dev *hdev)







		case 0x12:      /* ThP */









		case 0x13:      /* HrP */









		case 0x14:      /* CcP */









			set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);









			fallthrough;









		case 0x0c:	/* WsP */









			/* Apply the device specific HCI quirks








@@ -3048,9 +3044,6 @@ static int btintel_setup_combined(struct hci_dev *hdev)







		/* These variants don't seem to support LE Coded PHY */









		set_bit(HCI_QUIRK_BROKEN_LE_CODED, &hdev->quirks);



















		/* Set Valid LE States quirk */









		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);



















		/* Setup MSFT Extension support */









		btintel_set_msft_opcode(hdev, ver.hw_variant);


















@@ -3076,9 +3069,6 @@ static int btintel_setup_combined(struct hci_dev *hdev)







		 */









		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);



















		/* Apply LE States quirk from solar onwards */









		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);



















		/* Setup MSFT Extension support */









		btintel_set_msft_opcode(hdev,









					INTEL_HW_VARIANT(ver_tlv.cnvi_bt));
































drivers/bluetooth/btintel_pcie.c



+0
−3






























Original line number
Diff line number
Diff line







@@ -1180,9 +1180,6 @@ static int btintel_pcie_setup(struct hci_dev *hdev)







		 */









		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);



















		/* Apply LE States quirk from solar onwards */









		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);



















		/* Setup MSFT Extension support */









		btintel_set_msft_opcode(hdev,









					INTEL_HW_VARIANT(ver_tlv.cnvi_bt));
































drivers/bluetooth/btmtksdio.c



+0
−3






























Original line number
Diff line number
Diff line







@@ -1148,9 +1148,6 @@ static int btmtksdio_setup(struct hci_dev *hdev)







			}









		}



















		/* Valid LE States quirk for MediaTek 7921 */









		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);



















		break;









	case 0x7663:









	case 0x7668:
































drivers/bluetooth/btrtl.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -1287,7 +1287,6 @@ void btrtl_set_quirks(struct hci_dev *hdev, struct btrtl_device_info *btrtl_dev)







	case CHIP_ID_8852C:









	case CHIP_ID_8851B:









	case CHIP_ID_8852BT:









		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);









		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);



















		/* RTL8852C needs to transmit mSBC data continuously without