Matthieu Baerts 34a02011c5 hsr: ratelimit only when errors are printed ... commit 1b0120e4db upstream. Recently, when automatically merging -net and net-next in MPTCP devel tree, our CI reported [1] a conflict in hsr, the same as the one reported by Stephen in netdev [2]. When looking at the conflict, I noticed it is in fact the v1 [3] that has been applied in -net and the v2 [4] in net-next. Maybe the v1 was applied by accident. As mentioned by Jakub Kicinski [5], the new condition makes more sense before the net_ratelimit(), not to update net_ratelimit's state which is unnecessary if we're not going to print either way. Here, this modification applies the v2 but in -net. Link: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/4423171069 [1] Link: https://lore.kernel.org/netdev/20230315100914.53fc1760@canb.auug.org.au/ [2] Link: https://lore.kernel.org/netdev/20230307133229.127442-1-koverskeid@gmail.com/ [3] Link: https://lore.kernel.org/netdev/20230309092302.179586-1-koverskeid@gmail.com/ [4] Link: https://lore.kernel.org/netdev/20230308232001.2fb62013@kernel.org/ [5] Fixes: 28e8cabe80 ("net: hsr: Don't log netdev_err message on unknown prp dst node") Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com> Link: https://lore.kernel.org/r/20230315-net-20230315-hsr_framereg-ratelimit-v1-1-61d2ef176d11@tessares.net Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2023-04-05 11:23:52 +02:00
..
6lowpan	6lowpan: iphc: Fix an off-by-one check of array index	2021-09-15 09:50:34 +02:00
9p	9p/rdma: unmap receive dma buffer in rdma_request()/post_recv()	2023-03-11 16:40:13 +01:00
802	mrp: introduce active flags to prevent UAF when applicant uninit	2023-01-14 10:16:18 +01:00
8021q	net: make free_netdev() more lenient with unregistering devices	2022-07-29 17:19:07 +02:00
appletalk
atm	net/atm: fix proc_mpc_write incorrect return value	2022-10-30 09:41:16 +01:00
ax25	net: ax25: Fix deadlock caused by skb_recv_datagram in ax25_recvmsg	2022-06-22 14:13:17 +02:00
batman-adv	batman-adv: Don't skb_split skbuffs with frag_list	2022-05-18 10:23:42 +02:00
bluetooth	Bluetooth: L2CAP: Fix responding with wrong PDU type	2023-04-05 11:23:36 +02:00
bpf	bpf: Move skb->len == 0 checks into __bpf_redirect	2023-01-14 10:15:31 +01:00
bpfilter
bridge	netfilter: ebtables: fix table blob use-after-free	2023-03-11 16:40:12 +01:00
caif	net: caif: Fix use-after-free in cfusbl_device_notify()	2023-03-17 08:45:11 +01:00
can	can: bcm: bcm_tx_setup(): fix KMSAN uninit-value in vfs_write	2023-04-05 11:23:47 +02:00
ceph	libceph: fix potential use-after-free on linger ping and resends	2022-05-25 09:17:56 +02:00
core	skbuff: Fix nfct leak on napi stolen	2023-03-17 08:45:15 +01:00
dcb	net: dcb: disable softirqs in dcbnl_flush_dev()	2022-03-08 19:09:37 +01:00
dccp	dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.	2023-02-22 12:55:57 +01:00
decnet	net: Fix data-races around sysctl_[rw]mem(_offset)?.	2022-08-31 17:15:19 +02:00
dns_resolver
dsa	net: dsa: ksz: Check return value	2022-12-14 11:32:01 +01:00
ethernet
ethtool	net/ethtool/ioctl: return -EOPNOTSUPP if we have no phy stats	2023-01-24 07:19:55 +01:00
hsr	hsr: ratelimit only when errors are printed	2023-04-05 11:23:52 +02:00
ieee802154	net: ieee802154: fix error return code in dgram_bind()	2022-11-03 23:57:51 +09:00
ife
ipv4	erspan: do not use skb_mac_header() in ndo_start_xmit()	2023-04-05 11:23:35 +02:00
ipv6	erspan: do not use skb_mac_header() in ndo_start_xmit()	2023-04-05 11:23:35 +02:00
iucv	net/iucv: Fix size of interrupt data	2023-03-22 13:30:00 +01:00
kcm	kcm: close race conditions on sk_receive_queue	2022-11-25 17:45:56 +01:00
key	af_key: Fix send_acquire race with pfkey_register	2022-12-02 17:39:58 +01:00
l2tp	l2tp: Avoid possible recursive deadlock in l2tp_tunnel_register()	2023-03-11 16:39:29 +01:00
l3mdev	l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu	2022-04-27 13:53:50 +02:00
lapb
llc	llc: only change llc->dev when bind() succeeds	2022-03-28 09:57:10 +02:00
mac80211	wifi: mac80211: fix qos on mesh interfaces	2023-04-05 11:23:41 +02:00
mac802154	mac802154: fix missing INIT_LIST_HEAD in ieee802154_if_add()	2022-12-14 11:32:01 +01:00
mpls	net: mpls: fix stale pointer if allocation fails during device rename	2023-02-22 12:55:58 +01:00
mptcp	mptcp: avoid setting TCP_CLOSE state twice	2023-03-22 13:30:04 +01:00
ncsi	net/ncsi: check for error return from call to nla_put_u32	2022-01-05 12:40:32 +01:00
netfilter	netfilter: nft_redir: correct value of inet type .maxattrs	2023-03-22 13:29:57 +01:00
netlabel	netlabel: fix out-of-bounds memory accesses	2022-04-13 21:01:00 +02:00
netlink	netlink: annotate data races around sk_state	2023-02-01 08:23:24 +01:00
netrom	netrom: Fix use-after-free caused by accept on already connected socket	2023-02-15 17:22:12 +01:00
nfc	nfc: change order inside nfc_se_io error path	2023-03-17 08:45:07 +01:00
nsh
openvswitch	net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()	2023-02-22 12:55:57 +01:00
packet	net/af_packet: make sure to pull mac header	2023-01-14 10:16:29 +01:00
phonet	phonet: refcount leak in pep_sock_accep	2022-01-11 15:25:01 +01:00
psample
qrtr	net: qrtr: free memory on error path in radix_tree_insert()	2023-02-15 17:22:16 +01:00
rds	rds: rds_rm_zerocopy_callback() correct order for list_add_tail()	2023-03-11 16:39:26 +01:00
rfkill
rose	net/rose: Fix to not accept on connected socket	2023-02-22 12:55:53 +01:00
rxrpc	rxrpc: Fix missing unlock in rxrpc_do_sendmsg()	2023-01-14 10:16:12 +01:00
sched	net/sched: act_sample: fix action bind logic	2023-03-11 16:40:13 +01:00
sctp	sctp: add a refcnt in sctp_stream_priorities to avoid a nested loop	2023-03-11 16:40:12 +01:00
smc	net/smc: fix deadlock triggered by cancel_delayed_work_syn()	2023-03-22 13:29:58 +01:00
strparser	bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and colliding	2021-11-18 14:04:27 +01:00
sunrpc	SUNRPC: Fix a server shutdown leak	2023-03-17 08:45:12 +01:00
switchdev
tipc	tipc: fix unexpected link reset due to discovery messages	2023-01-18 11:44:58 +01:00
tls	net: tls: fix possible race condition between do_tls_getsockopt_conf() and do_tls_setsockopt_conf()	2023-04-05 11:23:31 +02:00
unix	af_unix: Get user_ns from in_skb in unix_diag_get_exact().	2022-12-14 11:32:01 +01:00
vmw_vsock	net: vmw_vsock: vmci: Check memcpy_from_msg()	2023-01-14 10:15:42 +01:00
wimax
wireless	wifi: cfg80211: Partial revert "wifi: cfg80211: Fix use after free for wext"	2023-03-13 10:19:36 +01:00
x25	net/x25: Fix to not accept on connected socket	2023-02-15 17:22:15 +01:00
xdp	xsk: Add missing overflow check in xdp_umem_reg	2023-04-05 11:23:32 +02:00
xfrm	xfrm: Allow transport-mode states with AF_UNSPEC selector	2023-03-22 13:29:55 +01:00
compat.c
devres.c
Kconfig
Makefile
socket.c	net: remove cmsg restriction from io_uring based send/recvmsg calls	2023-01-04 11:39:24 +01:00
sysctl_net.c