Commit 1d227fcc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.12-rc3' 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:

   - dsa: sja1105: fix reception from VLAN-unaware bridges

   - Revert "net: stmmac: set PP_FLAG_DMA_SYNC_DEV only if XDP is
     enabled"

   - eth: fec: don't save PTP state if PTP is unsupported

  Current release - new code bugs:

   - smc: fix lack of icsk_syn_mss with IPPROTO_SMC, prevent null-deref

   - eth: airoha: update Tx CPU DMA ring idx at the end of xmit loop

   - phy: aquantia: AQR115c fix up PMA capabilities

  Previous releases - regressions:

   - tcp: 3 fixes for retrans_stamp and undo logic

  Previous releases - always broken:

   - net: do not delay dst_entries_add() in dst_release()

   - netfilter: restrict xtables extensions to families that are safe,
     syzbot found a way to combine ebtables with extensions that are
     never used by userspace tools

   - sctp: ensure sk_state is set to CLOSED if hashing fails in
     sctp_listen_start

   - mptcp: handle consistently DSS corruption, and prevent corruption
     due to large pmtu xmit"

* tag 'net-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (87 commits)
  MAINTAINERS: Add headers and mailing list to UDP section
  MAINTAINERS: consistently exclude wireless files from NETWORKING [GENERAL]
  slip: make slhc_remember() more robust against malicious packets
  net/smc: fix lacks of icsk_syn_mss with IPPROTO_SMC
  ppp: fix ppp_async_encode() illegal access
  docs: netdev: document guidance on cleanup patches
  phonet: Handle error of rtnl_register_module().
  mpls: Handle error of rtnl_register_module().
  mctp: Handle error of rtnl_register_module().
  bridge: Handle error of rtnl_register_module().
  vxlan: Handle error of rtnl_register_module().
  rtnetlink: Add bulk registration helpers for rtnetlink message handlers.
  net: do not delay dst_entries_add() in dst_release()
  mptcp: pm: do not remove closing subflows
  mptcp: fallback when MPTCP opts are dropped after 1st data
  tcp: fix mptcp DSS corruption due to large pmtu xmit
  mptcp: handle consistently DSS corruption
  net: netconsole: fix wrong warning
  net: dsa: refuse cross-chip mirroring operations
  net: fec: don't save PTP state if PTP is unsupported
  ...
parents 0edab8d1 7b43ba65

Documentation/networking/tcp_ao.rst

+10 −10
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ segments between trusted peers. It adds a new TCP header option with 
a Message Authentication Code (MAC). MACs are produced from the content

of a TCP segment using a hashing function with a password known to both peers.

The intent of TCP-AO is to deprecate TCP-MD5 providing better security,

key rotation and support for variety of hashing algorithms.

key rotation and support for a variety of hashing algorithms.



1. Introduction

===============
@@ -164,9 +164,9 @@ A: It should not, no action needs to be performed [7.5.2.e]:: 
       is not available, no action is required (RNextKeyID of a received

       segment needs to match the MKT’s SendID).



Q: How current_key is set and when does it change? It is a user-triggered

change, or is it by a request from the remote peer? Is it set by the user

explicitly, or by a matching rule?

Q: How is current_key set, and when does it change? Is it a user-triggered

change, or is it triggered by a request from the remote peer? Is it set by the

user explicitly, or by a matching rule?



A: current_key is set by RNextKeyID [6.1]::
@@ -233,8 +233,8 @@ always have one current_key [3.3]:: 


Q: Can a non-TCP-AO connection become a TCP-AO-enabled one?



A: No: for already established non-TCP-AO connection it would be impossible

to switch using TCP-AO as the traffic key generation requires the initial

A: No: for an already established non-TCP-AO connection it would be impossible

to switch to using TCP-AO, as the traffic key generation requires the initial

sequence numbers. Paraphrasing, starting using TCP-AO would require

re-establishing the TCP connection.
@@ -292,7 +292,7 @@ no transparency is really needed and modern BGP daemons already have 


Linux provides a set of ``setsockopt()s`` and ``getsockopt()s`` that let

userspace manage TCP-AO on a per-socket basis. In order to add/delete MKTs

``TCP_AO_ADD_KEY`` and ``TCP_AO_DEL_KEY`` TCP socket options must be used

``TCP_AO_ADD_KEY`` and ``TCP_AO_DEL_KEY`` TCP socket options must be used.

It is not allowed to add a key on an established non-TCP-AO connection

as well as to remove the last key from TCP-AO connection.
@@ -361,7 +361,7 @@ not implemented. 
4. ``setsockopt()`` vs ``accept()`` race

========================================



In contrast with TCP-MD5 established connection which has just one key,

In contrast with an established TCP-MD5 connection which has just one key,

TCP-AO connections may have many keys, which means that accepted connections

on a listen socket may have any amount of keys as well. As copying all those

keys on a first properly signed SYN would make the request socket bigger, that
@@ -374,7 +374,7 @@ keys from sockets that were already established, but not yet ``accept()``'ed, 
hanging in the accept queue.



The reverse is valid as well: if userspace adds a new key for a peer on

a listener socket, the established sockets in accept queue won't

a listener socket, the established sockets in the accept queue won't

have the new keys.



At this moment, the resolution for the two races:
@@ -382,7 +382,7 @@ At this moment, the resolution for the two races: 
and ``setsockopt(TCP_AO_DEL_KEY)`` vs ``accept()`` is delegated to userspace.

This means that it's expected that userspace would check the MKTs on the socket

that was returned by ``accept()`` to verify that any key rotation that

happened on listen socket is reflected on the newly established connection.

happened on the listen socket is reflected on the newly established connection.



This is a similar "do-nothing" approach to TCP-MD5 from the kernel side and

may be changed later by introducing new flags to ``tcp_ao_add``

Documentation/process/maintainer-netdev.rst

+17 −0
Original line number Diff line number Diff line
@@ -355,6 +355,8 @@ just do it. As a result, a sequence of smaller series gets merged quicker and 
with better review coverage. Re-posting large series also increases the mailing

list traffic.



.. _rcs:



Local variable ordering ("reverse xmas tree", "RCS")

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -391,6 +393,21 @@ APIs and helpers, especially scoped iterators. However, direct use of 
``__free()`` within networking core and drivers is discouraged.

Similar guidance applies to declaring variables mid-function.



Clean-up patches

~~~~~~~~~~~~~~~~



Netdev discourages patches which perform simple clean-ups, which are not in

the context of other work. For example:



* Addressing ``checkpatch.pl`` warnings

* Addressing :ref:`Local variable ordering<rcs>` issues

* Conversions to device-managed APIs (``devm_`` helpers)



This is because it is felt that the churn that such changes produce comes

at a greater cost than the value of such clean-ups.



Conversely, spelling and grammar fixes are not discouraged.



Resending after review

~~~~~~~~~~~~~~~~~~~~~~

MAINTAINERS

+17 −2
Original line number Diff line number Diff line
@@ -10270,7 +10270,7 @@ F: Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml 
F:	drivers/bus/hisi_lpc.c









HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)









M:	Yisen Zhuang <yisen.zhuang@huawei.com>









M:	Jian Shen <shenjian15@huawei.com>









M:	Salil Mehta <salil.mehta@huawei.com>









M:	Jijie Shao <shaojijie@huawei.com>









L:	netdev@vger.kernel.org








@@ -10279,7 +10279,7 @@ W:	http://www.hisilicon.com







F:	drivers/net/ethernet/hisilicon/hns3/

















HISILICON NETWORK SUBSYSTEM DRIVER









M:	Yisen Zhuang <yisen.zhuang@huawei.com>









M:	Jian Shen <shenjian15@huawei.com>









M:	Salil Mehta <salil.mehta@huawei.com>









L:	netdev@vger.kernel.org









S:	Maintained








@@ -16201,8 +16201,19 @@ F:	lib/random32.c







F:	net/









F:	tools/net/









F:	tools/testing/selftests/net/









X:	Documentation/networking/mac80211-injection.rst









X:	Documentation/networking/mac80211_hwsim/









X:	Documentation/networking/regulatory.rst









X:	include/net/cfg80211.h









X:	include/net/ieee80211_radiotap.h









X:	include/net/iw_handler.h









X:	include/net/mac80211.h









X:	include/net/wext.h









X:	net/9p/









X:	net/bluetooth/









X:	net/mac80211/









X:	net/rfkill/









X:	net/wireless/

















NETWORKING [IPSEC]









M:	Steffen Klassert <steffen.klassert@secunet.com>








@@ -24177,8 +24188,12 @@ F:	drivers/usb/host/xhci*















USER DATAGRAM PROTOCOL (UDP)









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









L:	netdev@vger.kernel.org









S:	Maintained









F:	include/linux/udp.h









F:	include/net/udp.h









F:	include/trace/events/udp.h









F:	include/uapi/linux/udp.h









F:	net/ipv4/udp.c









F:	net/ipv6/udp.c

































drivers/bluetooth/btusb.c



+18
−2






























Original line number
Diff line number
Diff line







@@ -4038,16 +4038,29 @@ static void btusb_disconnect(struct usb_interface *intf)







static int btusb_suspend(struct usb_interface *intf, pm_message_t message)









{









	struct btusb_data *data = usb_get_intfdata(intf);









	int err;



















	BT_DBG("intf %p", intf);



















	/* Don't suspend if there are connections */









	if (hci_conn_count(data->hdev))









	/* Don't auto-suspend if there are connections; external suspend calls









	 * shall never fail.









	 */









	if (PMSG_IS_AUTO(message) && hci_conn_count(data->hdev))









		return -EBUSY;



















	if (data->suspend_count++)









		return 0;



















	/* Notify Host stack to suspend; this has to be done before stopping









	 * the traffic since the hci_suspend_dev itself may generate some









	 * traffic.









	 */









	err = hci_suspend_dev(data->hdev);









	if (err) {









		data->suspend_count--;









		return err;









	}



















	spin_lock_irq(&data->txlock);









	if (!(PMSG_IS_AUTO(message) && data->tx_in_flight)) {









		set_bit(BTUSB_SUSPENDING, &data->flags);








@@ -4055,6 +4068,7 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)







	} else {









		spin_unlock_irq(&data->txlock);









		data->suspend_count--;









		hci_resume_dev(data->hdev);









		return -EBUSY;









	}


















@@ -4175,6 +4189,8 @@ static int btusb_resume(struct usb_interface *intf)







	spin_unlock_irq(&data->txlock);









	schedule_work(&data->work);



















	hci_resume_dev(data->hdev);



















	return 0;



















failed:
































drivers/net/dsa/b53/b53_common.c



+13
−4






























Original line number
Diff line number
Diff line







@@ -27,6 +27,7 @@







#include <linux/phylink.h>









#include <linux/etherdevice.h>









#include <linux/if_bridge.h>









#include <linux/if_vlan.h>









#include <net/dsa.h>



















#include "b53_regs.h"








@@ -224,6 +225,9 @@ static const struct b53_mib_desc b53_mibs_58xx[] = {

















#define B53_MIBS_58XX_SIZE	ARRAY_SIZE(b53_mibs_58xx)



















#define B53_MAX_MTU_25		(1536 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN)









#define B53_MAX_MTU		(9720 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN)



















static int b53_do_vlan_op(struct b53_device *dev, u8 op)









{









	unsigned int i;








@@ -2254,20 +2258,25 @@ static int b53_change_mtu(struct dsa_switch *ds, int port, int mtu)







	bool allow_10_100;



















	if (is5325(dev) || is5365(dev))









		return -EOPNOTSUPP;









		return 0;



















	if (!dsa_is_cpu_port(ds, port))









		return 0;



















	enable_jumbo = (mtu >= JMS_MIN_SIZE);









	allow_10_100 = (dev->chip_id == BCM583XX_DEVICE_ID);









	enable_jumbo = (mtu > ETH_DATA_LEN);









	allow_10_100 = !is63xx(dev);



















	return b53_set_jumbo(dev, enable_jumbo, allow_10_100);









}



















static int b53_get_max_mtu(struct dsa_switch *ds, int port)









{









	return JMS_MAX_SIZE;









	struct b53_device *dev = ds->priv;



















	if (is5325(dev) || is5365(dev))









		return B53_MAX_MTU_25;



















	return B53_MAX_MTU;









}



















static const struct phylink_mac_ops b53_phylink_mac_ops = {