Commit 6e27831b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from netfilter.

  Current release - regressions:

   - mtk_eth_soc: fix NULL pointer dereference

  Previous releases - regressions:

   - core:
      - skb_partial_csum_set() fix against transport header magic value
      - fix load-tearing on sk->sk_stamp in sock_recv_cmsgs().
      - annotate sk->sk_err write from do_recvmmsg()
      - add vlan_get_protocol_and_depth() helper

   - netlink: annotate accesses to nlk->cb_running

   - netfilter: always release netdev hooks from notifier

  Previous releases - always broken:

   - core: deal with most data-races in sk_wait_event()

   - netfilter: fix possible bug_on with enable_hooks=1

   - eth: bonding: fix send_peer_notif overflow

   - eth: xpcs: fix incorrect number of interfaces

   - eth: ipvlan: fix out-of-bounds caused by unclear skb->cb

   - eth: stmmac: Initialize MAC_ONEUS_TIC_COUNTER register"

* tag 'net-6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (31 commits)
  af_unix: Fix data races around sk->sk_shutdown.
  af_unix: Fix a data race of sk->sk_receive_queue->qlen.
  net: datagram: fix data-races in datagram_poll()
  net: mscc: ocelot: fix stat counter register values
  ipvlan:Fix out-of-bounds caused by unclear skb->cb
  docs: networking: fix x25-iface.rst heading & index order
  gve: Remove the code of clearing PBA bit
  tcp: add annotations around sk->sk_shutdown accesses
  net: add vlan_get_protocol_and_depth() helper
  net: pcs: xpcs: fix incorrect number of interfaces
  net: deal with most data-races in sk_wait_event()
  net: annotate sk->sk_err write from do_recvmmsg()
  netlink: annotate accesses to nlk->cb_running
  kselftest: bonding: add num_grat_arp test
  selftests: forwarding: lib: add netns support for tc rule handle stats get
  Documentation: bonding: fix the doc of peer_notif_delay
  bonding: fix send_peer_notif overflow
  net: ethernet: mtk_eth_soc: fix NULL pointer dereference
  selftests: nft_flowtable.sh: check ingress/egress chain too
  selftests: nft_flowtable.sh: monitor result file sizes
  ...
parents 691e1eee cceac926

Documentation/networking/bonding.rst

+5 −4
Original line number Diff line number Diff line
@@ -776,10 +776,11 @@ peer_notif_delay 
	Specify the delay, in milliseconds, between each peer

	notification (gratuitous ARP and unsolicited IPv6 Neighbor

	Advertisement) when they are issued after a failover event.

	This delay should be a multiple of the link monitor interval

	(arp_interval or miimon, whichever is active). The default

	value is 0 which means to match the value of the link monitor

	interval.

	This delay should be a multiple of the MII link monitor interval

	(miimon).



	The valid range is 0 - 300000. The default value is 0, which means

	to match the value of the MII link monitor interval.



prio

	Slave priority. A higher number means higher priority.

Documentation/networking/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ Contents: 
   udplite

   vrf

   vxlan

   x25-iface

   x25

   x25-iface

   xfrm_device

   xfrm_proc

   xfrm_sync

Documentation/networking/x25-iface.rst

+1 −2
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



============================-

X.25 Device Driver Interface

============================-

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



Version 1.1

drivers/net/bonding/bond_netlink.c

+6 −1
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ static int bond_fill_slave_info(struct sk_buff *skb, 
	return -EMSGSIZE;

}



/* Limit the max delay range to 300s */

static struct netlink_range_validation delay_range = {

	.max = 300000,

};



static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {

	[IFLA_BOND_MODE]		= { .type = NLA_U8 },

	[IFLA_BOND_ACTIVE_SLAVE]	= { .type = NLA_U32 },
@@ -114,7 +119,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { 
	[IFLA_BOND_AD_ACTOR_SYSTEM]	= { .type = NLA_BINARY,

					    .len  = ETH_ALEN },

	[IFLA_BOND_TLB_DYNAMIC_LB]	= { .type = NLA_U8 },

	[IFLA_BOND_PEER_NOTIF_DELAY]    = { .type = NLA_U32 },

	[IFLA_BOND_PEER_NOTIF_DELAY]    = NLA_POLICY_FULL_RANGE(NLA_U32, &delay_range),

	[IFLA_BOND_MISSED_MAX]		= { .type = NLA_U8 },

	[IFLA_BOND_NS_IP6_TARGET]	= { .type = NLA_NESTED },

};

drivers/net/bonding/bond_options.c

+7 −1
Original line number Diff line number Diff line
@@ -169,6 +169,12 @@ static const struct bond_opt_value bond_num_peer_notif_tbl[] = { 
	{ NULL,      -1,  0}

};



static const struct bond_opt_value bond_peer_notif_delay_tbl[] = {

	{ "off",     0,   0},

	{ "maxval",  300000, BOND_VALFLAG_MAX},

	{ NULL,      -1,  0}

};



static const struct bond_opt_value bond_primary_reselect_tbl[] = {

	{ "always",  BOND_PRI_RESELECT_ALWAYS,  BOND_VALFLAG_DEFAULT},

	{ "better",  BOND_PRI_RESELECT_BETTER,  0},
@@ -488,7 +494,7 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = { 
		.id = BOND_OPT_PEER_NOTIF_DELAY,

		.name = "peer_notif_delay",

		.desc = "Delay between each peer notification on failover event, in milliseconds",

		.values = bond_intmax_tbl,

		.values = bond_peer_notif_delay_tbl,

		.set = bond_option_peer_notif_delay_set

	}

};