Commit 74c78b42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from.. Santa?

  No regressions on our radar at this point. The igc problem fixed here
  was the last one I was tracking but it was broken in previous
  releases, anyway. Mostly driver fixes and a couple of largish SMC
  fixes.

  Current release - regressions:

   - xsk: initialise xskb free_list_node, fixup for a -rc7 fix

  Current release - new code bugs:

   - mlx5: handful of minor fixes:

   - use first online CPU instead of hard coded CPU

   - fix some error handling paths in 'mlx5e_tc_add_fdb_flow()'

   - fix skb memory leak when TC classifier action offloads are disabled

   - fix memory leak with rules with internal OvS port

  Previous releases - regressions:

   - igc: do not enable crosstimestamping for i225-V models

  Previous releases - always broken:

   - udp: use datalen to cap ipv6 udp max gso segments

   - fix use-after-free in tw_timer_handler due to early free of stats

   - smc: fix kernel panic caused by race of smc_sock

   - smc: don't send CDC/LLC message if link not ready, avoid timeouts

   - sctp: use call_rcu to free endpoint, avoid UAF in sock diag

   - bridge: mcast: add and enforce query interval minimum

   - usb: pegasus: do not drop long Ethernet frames

   - mlx5e: fix ICOSQ recovery flow for XSK

   - nfc: uapi: use kernel size_t to fix user-space builds"

* tag 'net-5.16-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (47 commits)
  fsl/fman: Fix missing put_device() call in fman_port_probe
  selftests: net: using ping6 for IPv6 in udpgro_fwd.sh
  Documentation: fix outdated interpretation of ip_no_pmtu_disc
  net/ncsi: check for error return from call to nla_put_u32
  net: bridge: mcast: fix br_multicast_ctx_vlan_global_disabled helper
  net: fix use-after-free in tw_timer_handler
  selftests: net: Fix a typo in udpgro_fwd.sh
  selftests/net: udpgso_bench_tx: fix dst ip argument
  net: bridge: mcast: add and enforce startup query interval minimum
  net: bridge: mcast: add and enforce query interval minimum
  ipv6: raw: check passed optlen before reading
  xsk: Initialise xskb free_list_node
  net/mlx5e: Fix wrong features assignment in case of error
  net/mlx5e: TC, Fix memory leak with rules with internal port
  ionic: Initialize the 'lif->dbid_inuse' bitmap
  igc: Fix TX timestamp support for non-MSI-X platforms
  igc: Do not enable crosstimestamping for i225-V models
  net/smc: fix kernel panic caused by race of smc_sock
  net/smc: don't send CDC/LLC message if link not ready
  NFC: st21nfca: Fix memory leak in device probe and remove
  ...
parents 9bad743e bf2b09fe

Documentation/networking/ip-sysctl.rst

+4 −2
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ ip_default_ttl - INTEGER 
ip_no_pmtu_disc - INTEGER

	Disable Path MTU Discovery. If enabled in mode 1 and a

	fragmentation-required ICMP is received, the PMTU to this

	destination will be set to min_pmtu (see below). You will need

	destination will be set to the smallest of the old MTU to

	this destination and min_pmtu (see below). You will need

	to raise min_pmtu to the smallest interface MTU on your system

	manually if you want to avoid locally generated fragments.
@@ -49,7 +50,8 @@ ip_no_pmtu_disc - INTEGER 
	Default: FALSE



min_pmtu - INTEGER

	default 552 - minimum discovered Path MTU

	default 552 - minimum Path MTU. Unless this is changed mannually,

	each cached pmtu will never be lower than this setting.



ip_forward_use_pmtu - BOOLEAN

	By default we don't trust protocol path MTUs while forwarding

drivers/isdn/mISDN/core.c

+3 −3
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ mISDNInit(void) 
	err = mISDN_inittimer(&debug);

	if (err)

		goto error2;

	err = l1_init(&debug);

	err = Isdnl1_Init(&debug);

	if (err)

		goto error3;

	err = Isdnl2_Init(&debug);
@@ -395,7 +395,7 @@ mISDNInit(void) 
error5:

	Isdnl2_cleanup();

error4:

	l1_cleanup();

	Isdnl1_cleanup();

error3:

	mISDN_timer_cleanup();

error2:
@@ -408,7 +408,7 @@ static void mISDN_cleanup(void) 
{

	misdn_sock_cleanup();

	Isdnl2_cleanup();

	l1_cleanup();

	Isdnl1_cleanup();

	mISDN_timer_cleanup();

	class_unregister(&mISDN_class);

drivers/isdn/mISDN/core.h

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ struct Bprotocol *get_Bprotocol4id(u_int); 
extern int	mISDN_inittimer(u_int *);

extern void	mISDN_timer_cleanup(void);



extern int	l1_init(u_int *);

extern void	l1_cleanup(void);

extern int	Isdnl1_Init(u_int *);

extern void	Isdnl1_cleanup(void);

extern int	Isdnl2_Init(u_int *);

extern void	Isdnl2_cleanup(void);

drivers/isdn/mISDN/layer1.c

+2 −2
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ create_l1(struct dchannel *dch, dchannel_l1callback *dcb) { 
EXPORT_SYMBOL(create_l1);



int

l1_init(u_int *deb)

Isdnl1_Init(u_int *deb)

{

	debug = deb;

	l1fsm_s.state_count = L1S_STATE_COUNT;
@@ -409,7 +409,7 @@ l1_init(u_int *deb) 
}



void

l1_cleanup(void)

Isdnl1_cleanup(void)

{

	mISDN_FsmFree(&l1fsm_s);

}

drivers/net/ethernet/aquantia/atlantic/aq_ring.c

+8 −0
Original line number Diff line number Diff line
@@ -366,6 +366,10 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
		if (!buff->is_eop) {

			buff_ = buff;

			do {

				if (buff_->next >= self->size) {

					err = -EIO;

					goto err_exit;

				}

				next_ = buff_->next,

				buff_ = &self->buff_ring[next_];

				is_rsc_completed =
@@ -389,6 +393,10 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
			    (buff->is_lro && buff->is_cso_err)) {

				buff_ = buff;

				do {

					if (buff_->next >= self->size) {

						err = -EIO;

						goto err_exit;

					}

					next_ = buff_->next,

					buff_ = &self->buff_ring[next_];