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

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

Pull  networking fixes from Jakub Kicinski:
 "Including fixes from Netfilter.

  Steady stream of fixes. Last two weeks feel comparable to the two
  weeks before the merge window. Lots of AI-aided bug discovery. A newer
  big source is Sashiko/Gemini (Roman Gushchin's system), which points
  out issues in existing code during patch review (maybe 25% of fixes
  here likely originating from Sashiko). Nice thing is these are often
  fixed by the respective maintainers, not drive-bys.

  Current release - new code bugs:

   - kconfig: MDIO_PIC64HPSC should depend on ARCH_MICROCHIP

  Previous releases - regressions:

   - add async ndo_set_rx_mode and switch drivers which we promised to
     be called under the per-netdev mutex to it

   - dsa: remove duplicate netdev_lock_ops() for conduit ethtool ops

   - hv_sock: report EOF instead of -EIO for FIN

   - vsock/virtio: fix MSG_PEEK calculation on bytes to copy

  Previous releases - always broken:

   - ipv6: fix possible UAF in icmpv6_rcv()

   - icmp: validate reply type before using icmp_pointers

   - af_unix: drop all SCM attributes for SOCKMAP

   - netfilter: fix a number of bugs in the osf (OS fingerprinting)

   - eth: intel: fix timestamp interrupt configuration for E825C

  Misc:

   - bunch of data-race annotations"

* tag 'net-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (148 commits)
  rxrpc: Fix error handling in rxgk_extract_token()
  rxrpc: Fix re-decryption of RESPONSE packets
  rxrpc: Fix rxrpc_input_call_event() to only unshare DATA packets
  rxrpc: Fix missing validation of ticket length in non-XDR key preparsing
  rxgk: Fix potential integer overflow in length check
  rxrpc: Fix conn-level packet handling to unshare RESPONSE packets
  rxrpc: Fix potential UAF after skb_unshare() failure
  rxrpc: Fix rxkad crypto unalignment handling
  rxrpc: Fix memory leaks in rxkad_verify_response()
  net: rds: fix MR cleanup on copy error
  m68k: mvme147: Make me the maintainer
  net: txgbe: fix firmware version check
  selftests/bpf: check epoll readiness during reuseport migration
  tcp: call sk_data_ready() after listener migration
  vhost_net: fix sleeping with preempt-disabled in vhost_net_busy_poll()
  ipv6: Cap TLV scan in ip6_tnl_parse_tlv_enc_lim
  tipc: fix double-free in tipc_buf_append()
  llc: Return -EINPROGRESS from llc_ui_connect()
  ipv4: icmp: validate reply type before using icmp_pointers
  selftests/net: packetdrill: cover RFC 5961 5.2 challenge ACK on both edges
  ...
parents e8df5a0c 5e6391da

Documentation/networking/netdevices.rst

+13 −0
Original line number Diff line number Diff line
@@ -289,6 +289,19 @@ ndo_tx_timeout: 
ndo_set_rx_mode:

	Synchronization: netif_addr_lock spinlock.

	Context: BHs disabled

	Notes: Deprecated in favor of ndo_set_rx_mode_async which runs

	in process context.



ndo_set_rx_mode_async:

	Synchronization: rtnl_lock() semaphore. In addition, netdev instance

	lock if the driver implements queue management or shaper API.

	Context: process (from a work queue)

	Notes: Async version of ndo_set_rx_mode which runs in process

	context. Receives snapshots of the unicast and multicast address lists.



ndo_change_rx_flags:

	Synchronization: rtnl_lock() semaphore. In addition, netdev instance

	lock if the driver implements queue management or shaper API.



ndo_setup_tc:

	``TC_SETUP_BLOCK`` and ``TC_SETUP_FT`` are running under NFT locks

Documentation/process/maintainer-netdev.rst

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ The exact rules a driver must follow to acquire the ``Supported`` status: 
   status will be withdrawn.



5. Test failures due to bugs either in the driver or the test itself,

   or lack of support for the feature the test is targgeting are

   or lack of support for the feature the test is targeting are

   *not* a basis for losing the ``Supported`` status.



netdev CI will maintain an official page of supported devices, listing their

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -15337,6 +15337,13 @@ S: Maintained 
W:	http://www.tazenda.demon.co.uk/phil/linux-hp

F:	arch/m68k/hp300/









M68K ON MVME147









M:	Daniel Palmer <daniel@thingy.jp>









S:	Maintained









F:	arch/m68k/mvme147/









F:	drivers/net/ethernet/amd/mvme147.c









F:	drivers/scsi/mvme147.*

















M88DS3103 MEDIA DRIVER









L:	linux-media@vger.kernel.org









S:	Orphan
































drivers/net/dsa/realtek/rtl8365mb.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -216,7 +216,7 @@







		 (_extint) == 2 ? RTL8365MB_DIGITAL_INTERFACE_SELECT_REG1 : \









		 0x0)









#define   RTL8365MB_DIGITAL_INTERFACE_SELECT_MODE_MASK(_extint) \









		(0xF << (((_extint) % 2)))









		(0xF << (((_extint) % 2) * 4))









#define   RTL8365MB_DIGITAL_INTERFACE_SELECT_MODE_OFFSET(_extint) \









		(((_extint) % 2) * 4)










































drivers/net/dummy.c



+4
−2






























Original line number
Diff line number
Diff line







@@ -47,7 +47,9 @@







static int numdummies = 1;



















/* fake multicast ability */









static void set_multicast_list(struct net_device *dev)









static void set_multicast_list(struct net_device *dev,









			       struct netdev_hw_addr_list *uc,









			       struct netdev_hw_addr_list *mc)









{









}


















@@ -87,7 +89,7 @@ static const struct net_device_ops dummy_netdev_ops = {







	.ndo_init		= dummy_dev_init,









	.ndo_start_xmit		= dummy_xmit,









	.ndo_validate_addr	= eth_validate_addr,









	.ndo_set_rx_mode	= set_multicast_list,









	.ndo_set_rx_mode_async	= set_multicast_list,









	.ndo_set_mac_address	= eth_mac_addr,









	.ndo_get_stats64	= dummy_get_stats64,









	.ndo_change_carrier	= dummy_change_carrier,