Nikolay Aleksandrov 907c97986d net: ipv4: fix route with nexthop object delete warning ... [ Upstream commit 6bf92d70e6 ] FRR folks have hit a kernel warning[1] while deleting routes[2] which is caused by trying to delete a route pointing to a nexthop id without specifying nhid but matching on an interface. That is, a route is found but we hit a warning while matching it. The warning is from fib_info_nh() in include/net/nexthop.h because we run it on a fib_info with nexthop object. The call chain is: inet_rtm_delroute -> fib_table_delete -> fib_nh_match (called with a nexthop fib_info and also with fc_oif set thus calling fib_info_nh on the fib_info and triggering the warning). The fix is to not do any matching in that branch if the fi has a nexthop object because those are managed separately. I.e. we should match when deleting without nh spec and should fail when deleting a nexthop route with old-style nh spec because nexthop objects are managed separately, e.g.: $ ip r show 1.2.3.4/32 1.2.3.4 nhid 12 via 192.168.11.2 dev dummy0 $ ip r del 1.2.3.4/32 $ ip r del 1.2.3.4/32 nhid 12 <both should work> $ ip r del 1.2.3.4/32 dev dummy0 <should fail with ESRCH> [1] [ 523.462226] ------------[ cut here ]------------ [ 523.462230] WARNING: CPU: 14 PID: 22893 at include/net/nexthop.h:468 fib_nh_match+0x210/0x460 [ 523.462236] Modules linked in: dummy rpcsec_gss_krb5 xt_socket nf_socket_ipv4 nf_socket_ipv6 ip6table_raw iptable_raw bpf_preload xt_statistic ip_set ip_vs_sh ip_vs_wrr ip_vs_rr ip_vs xt_mark nf_tables xt_nat veth nf_conntrack_netlink nfnetlink xt_addrtype br_netfilter overlay dm_crypt nfsv3 nfs fscache netfs vhost_net vhost vhost_iotlb tap tun xt_CHECKSUM xt_MASQUERADE xt_conntrack 8021q garp mrp ipt_REJECT nf_reject_ipv4 ip6table_mangle ip6table_nat iptable_mangle iptable_nat nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 iptable_filter bridge stp llc rfcomm snd_seq_dummy snd_hrtimer rpcrdma rdma_cm iw_cm ib_cm ib_core ip6table_filter xt_comment ip6_tables vboxnetadp(OE) vboxnetflt(OE) vboxdrv(OE) qrtr bnep binfmt_misc xfs vfat fat squashfs loop nvidia_drm(POE) nvidia_modeset(POE) nvidia_uvm(POE) nvidia(POE) intel_rapl_msr intel_rapl_common snd_hda_codec_realtek snd_hda_codec_generic ledtrig_audio snd_hda_codec_hdmi btusb btrtl iwlmvm uvcvideo btbcm snd_hda_intel edac_mce_amd [ 523.462274] videobuf2_vmalloc videobuf2_memops btintel snd_intel_dspcfg videobuf2_v4l2 snd_intel_sdw_acpi bluetooth snd_usb_audio snd_hda_codec mac80211 snd_usbmidi_lib joydev snd_hda_core videobuf2_common kvm_amd snd_rawmidi snd_hwdep snd_seq videodev ccp snd_seq_device libarc4 ecdh_generic mc snd_pcm kvm iwlwifi snd_timer drm_kms_helper snd cfg80211 cec soundcore irqbypass rapl wmi_bmof i2c_piix4 rfkill k10temp pcspkr acpi_cpufreq nfsd auth_rpcgss nfs_acl lockd grace sunrpc drm zram ip_tables crct10dif_pclmul crc32_pclmul crc32c_intel ghash_clmulni_intel nvme sp5100_tco r8169 nvme_core wmi ipmi_devintf ipmi_msghandler fuse [ 523.462300] CPU: 14 PID: 22893 Comm: ip Tainted: P OE 5.16.18-200.fc35.x86_64 #1 [ 523.462302] Hardware name: Micro-Star International Co., Ltd. MS-7C37/MPG X570 GAMING EDGE WIFI (MS-7C37), BIOS 1.C0 10/29/2020 [ 523.462303] RIP: 0010:fib_nh_match+0x210/0x460 [ 523.462304] Code: 7c 24 20 48 8b b5 90 00 00 00 e8 bb ee f4 ff 48 8b 7c 24 20 41 89 c4 e8 ee eb f4 ff 45 85 e4 0f 85 2e fe ff ff e9 4c ff ff ff <0f> 0b e9 17 ff ff ff 3c 0a 0f 85 61 fe ff ff 48 8b b5 98 00 00 00 [ 523.462306] RSP: 0018:ffffaa53d4d87928 EFLAGS: 00010286 [ 523.462307] RAX: 0000000000000000 RBX: ffffaa53d4d87a90 RCX: ffffaa53d4d87bb0 [ 523.462308] RDX: ffff9e3d2ee6be80 RSI: ffffaa53d4d87a90 RDI: ffffffff920ed380 [ 523.462309] RBP: ffff9e3d2ee6be80 R08: 0000000000000064 R09: 0000000000000000 [ 523.462310] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000031 [ 523.462310] R13: 0000000000000020 R14: 0000000000000000 R15: ffff9e3d331054e0 [ 523.462311] FS: 00007f245517c1c0(0000) GS:ffff9e492ed80000(0000) knlGS:0000000000000000 [ 523.462313] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 523.462313] CR2: 000055e5dfdd8268 CR3: 00000003ef488000 CR4: 0000000000350ee0 [ 523.462315] Call Trace: [ 523.462316] <TASK> [ 523.462320] fib_table_delete+0x1a9/0x310 [ 523.462323] inet_rtm_delroute+0x93/0x110 [ 523.462325] rtnetlink_rcv_msg+0x133/0x370 [ 523.462327] ? _copy_to_iter+0xb5/0x6f0 [ 523.462330] ? rtnl_calcit.isra.0+0x110/0x110 [ 523.462331] netlink_rcv_skb+0x50/0xf0 [ 523.462334] netlink_unicast+0x211/0x330 [ 523.462336] netlink_sendmsg+0x23f/0x480 [ 523.462338] sock_sendmsg+0x5e/0x60 [ 523.462340] ____sys_sendmsg+0x22c/0x270 [ 523.462341] ? import_iovec+0x17/0x20 [ 523.462343] ? sendmsg_copy_msghdr+0x59/0x90 [ 523.462344] ? __mod_lruvec_page_state+0x85/0x110 [ 523.462348] ___sys_sendmsg+0x81/0xc0 [ 523.462350] ? netlink_seq_start+0x70/0x70 [ 523.462352] ? __dentry_kill+0x13a/0x180 [ 523.462354] ? __fput+0xff/0x250 [ 523.462356] __sys_sendmsg+0x49/0x80 [ 523.462358] do_syscall_64+0x3b/0x90 [ 523.462361] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 523.462364] RIP: 0033:0x7f24552aa337 [ 523.462365] Code: 0e 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b9 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10 [ 523.462366] RSP: 002b:00007fff7f05a838 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 523.462368] RAX: ffffffffffffffda RBX: 000000006245bf91 RCX: 00007f24552aa337 [ 523.462368] RDX: 0000000000000000 RSI: 00007fff7f05a8a0 RDI: 0000000000000003 [ 523.462369] RBP: 0000000000000000 R08: 0000000000000001 R09: 0000000000000000 [ 523.462370] R10: 0000000000000008 R11: 0000000000000246 R12: 0000000000000001 [ 523.462370] R13: 00007fff7f05ce08 R14: 0000000000000000 R15: 000055e5dfdd1040 [ 523.462373] </TASK> [ 523.462374] ---[ end trace ba537bc16f6bf4ed ]--- [2] https://github.com/FRRouting/frr/issues/6412 Fixes: 4c7e8084fd ("ipv4: Plumb support for nexthop object in a fib_info") Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org> Reviewed-by: David Ahern <dsahern@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>		2022-04-13 20:59:16 +02:00
..
bpfilter	net: Revert "net: optimize the sockptr_t for unified kernel/user address spaces"	2020-08-10 12:06:44 -07:00
netfilter	netfilter: ipt_CLUSTERIP: fix refcount leak in clusterip_tg_check()	2022-01-27 11:03:50 +01:00
af_inet.c	gso: do not skip outer ip header in case of ipip and net_failover	2022-03-02 11:47:56 +01:00
ah4.c	Networking changes for 5.14.	2021-06-30 15:51:09 -07:00
arp.c	ipv4: Invalidate neighbour for broadcast address upon address addition	2022-04-13 20:59:05 +02:00
bpf_tcp_ca.c	bpf: Forbid bpf_ktime_get_coarse_ns and bpf_timer_* in tracing progs	2021-11-25 09:49:07 +01:00
cipso_ipv4.c	net: remove the unnecessary check in cipso_v4_doi_free	2021-09-03 13:52:29 +01:00
datagram.c
devinet.c	net: return correct error code	2021-12-08 09:04:38 +01:00
esp4_offload.c	esp: Fix BEET mode inter address family tunneling on GSO	2022-03-16 14:23:36 +01:00
esp4.c	esp: Fix possible buffer overflow in ESP transformation	2022-03-16 14:23:36 +01:00
fib_frontend.c	ipv4: Invalidate neighbour for broadcast address upon address addition	2022-04-13 20:59:05 +02:00
fib_lookup.h	ipv4: fix data races in fib_alias_hw_flags_set	2022-02-23 12:03:10 +01:00
fib_notifier.c
fib_rules.c	ipv4: convert fib_num_tclassid_users to atomic_t	2021-12-08 09:04:49 +01:00
fib_semantics.c	net: ipv4: fix route with nexthop object delete warning	2022-04-13 20:59:16 +02:00
fib_trie.c	ipv4: fix data races in fib_alias_hw_flags_set	2022-02-23 12:03:10 +01:00
fou.c	fou: remove sparse errors	2021-08-31 12:03:33 +01:00
gre_demux.c	net: Remove the member netns_ok	2021-05-17 15:29:35 -07:00
gre_offload.c	ip_gre: add csum offload support for gre header	2021-01-29 20:39:14 -08:00
icmp.c	icmp: fix icmp_ext_echo_iio parsing in icmp_build_probe	2021-10-14 07:54:47 -07:00
igmp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
inet_connection_sock.c	inet: use #ifdef CONFIG_SOCK_RX_QUEUE_MAPPING consistently	2021-12-17 10:30:13 +01:00
inet_diag.c	inet_diag: fix kernel-infoleak for UDP sockets	2021-12-22 09:32:40 +01:00
inet_fragment.c	inet: frags: annotate races around fqdir->dead and fqdir->high_thresh	2022-01-27 11:05:35 +01:00
inet_hashtables.c	tcp: Don't acquire inet_listen_hashbucket::lock with disabled BH.	2022-04-13 20:59:04 +02:00
inet_timewait_sock.c	net: Use generic ns_common::count	2020-08-19 14:06:36 +02:00
inetpeer.c	inetpeer: use div64_ul() and clamp_val() calculate inet_peer_threshold	2021-03-01 13:32:12 -08:00
ip_forward.c
ip_fragment.c	inet: frags: annotate races around fqdir->dead and fqdir->high_thresh	2022-01-27 11:05:35 +01:00
ip_gre.c	gre: Don't accidentally set RTO_ONLINK in gre_fill_metadata_dst()	2022-01-27 11:05:36 +01:00
ip_input.c	net: use indirect call helpers for dst_input	2021-02-03 14:51:39 -08:00
ip_options.c	net: clean up codestyle for net/ipv4	2020-08-25 06:28:02 -07:00
ip_output.c	net-timestamp: convert sk->sk_tskey to atomic_t	2022-03-02 11:48:01 +01:00
ip_sockglue.c	Revert "Revert "ipv4: fix memory leaks in ip_cmsg_send() callers""	2021-09-14 14:24:31 +01:00
ip_tunnel_core.c	net: ip_tunnel: clean up endianness conversions	2021-01-08 19:25:35 -08:00
ip_tunnel.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
ip_vti.c	ip_tunnel: use ndo_siocdevprivate	2021-07-27 20:11:44 +01:00
ipcomp.c	Networking changes for 5.14.	2021-06-30 15:51:09 -07:00
ipconfig.c	net: ipconfig: Don't override command-line hostnames or domains	2021-06-02 13:27:03 -07:00
ipip.c	ip_tunnel: use ndo_siocdevprivate	2021-07-27 20:11:44 +01:00
ipmr_base.c
ipmr.c	ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path	2022-02-16 12:56:29 +01:00
Kconfig	net: ipv4: remove duplicate "the the" phrase in Kconfig text	2020-08-18 16:02:16 -07:00
Makefile	bpf: Clean up sockmap related Kconfigs	2021-02-26 12:28:03 -08:00
metrics.c	treewide: rename nla_strlcpy to nla_strscpy.	2020-11-16 08:08:54 -08:00
netfilter.c	netfilter: Dissect flow after packet mangling	2021-04-18 22:04:16 +02:00
netlink.c
nexthop.c	net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group	2021-12-01 09:04:49 +01:00
ping.c	ping: remove pr_err from ping_lookup	2022-03-02 11:47:52 +01:00
proc.c	tcp: switch orphan_count to bare per-cpu counters	2021-11-18 19:16:33 +01:00
protocol.c	net: Remove the member netns_ok	2021-05-17 15:29:35 -07:00
raw_diag.c	net: Use nlmsg_unicast() instead of netlink_unicast()	2021-07-13 09:28:29 -07:00
raw.c	ipv4: raw: lock the socket in raw_bind()	2022-02-01 17:27:14 +01:00
route.c	ipv4: Fix route lookups when handling ICMP redirects and PMTU updates	2022-04-08 14:23:41 +02:00
syncookies.c	selinux/stable-5.11 PR 20201214	2020-12-16 11:01:04 -08:00
sysctl_net_ipv4.c	net: Introduce net.ipv4.tcp_migrate_req.	2021-06-15 18:01:05 +02:00
tcp_bbr.c	tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets	2021-08-11 15:00:15 -07:00
tcp_bic.c	tcp: fix stretch ACK bugs in BIC	2020-03-16 18:26:54 -07:00
tcp_bpf.c	bpf, sockmap: Fix double uncharge the mem of sk_msg	2022-04-08 14:23:40 +02:00
tcp_cdg.c
tcp_cong.c	net: Only allow init netns to set default tcp cong to a restricted algo	2021-05-04 11:58:28 -07:00
tcp_cubic.c	tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows	2021-12-01 09:04:52 +01:00
tcp_dctcp.c
tcp_dctcp.h
tcp_diag.c	inet_diag: Move the INET_DIAG_REQ_BYTECODE nlattr to cb->data	2020-02-27 18:50:19 -08:00
tcp_fastopen.c	tcp: enable data-less, empty-cookie SYN with TFO_SERVER_COOKIE_NOT_REQD	2021-08-16 17:25:49 -07:00
tcp_highspeed.c	Replace HTTP links with HTTPS ones: IPv*	2020-07-06 13:23:03 -07:00
tcp_htcp.c	Replace HTTP links with HTTPS ones: IPv*	2020-07-06 13:23:03 -07:00
tcp_hybla.c
tcp_illinois.c
tcp_input.c	tcp: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data()	2022-02-05 12:38:59 +01:00
tcp_ipv4.c	inet: fully convert sk->sk_rx_dst to RCU rules	2021-12-29 12:28:42 +01:00
tcp_lp.c	ipv4: tcp_lp.c: Couple of typo fixes	2021-03-28 17:31:13 -07:00
tcp_metrics.c	fixes-v5.11	2020-12-14 16:40:27 -08:00
tcp_minisocks.c	tcp: Add stats for socket migration.	2021-06-23 12:56:08 -07:00
tcp_nv.c
tcp_offload.c	net, gro: Set inner transport header offset in tcp/udp GRO hook	2021-08-02 10:20:56 +01:00
tcp_output.c	tcp: ensure PMTU updates are processed during fastopen	2022-04-08 14:23:42 +02:00
tcp_rate.c
tcp_recovery.c	tcp: more accurately check DSACKs to grow RACK reordering window	2021-07-27 20:07:21 +01:00
tcp_scalable.c	net: ipv4: delete repeated words	2020-08-24 17:31:20 -07:00
tcp_timer.c	net: sock: introduce sk_error_report	2021-06-29 11:28:21 -07:00
tcp_ulp.c	bpf: sockmap: Only check ULP for TCP sockets	2020-03-09 22:34:58 +01:00
tcp_vegas.c	tcp: use semicolons rather than commas to separate statements	2020-10-13 17:11:52 -07:00
tcp_vegas.h
tcp_veno.c	Replace HTTP links with HTTPS ones: IPv*	2020-07-06 13:23:03 -07:00
tcp_westwood.c
tcp_yeah.c	tcp_yeah: check struct yeah size at compile time	2021-06-29 11:54:36 -07:00
tcp.c	tcp: make tcp_read_sock() more robust	2022-03-19 13:47:50 +01:00
tunnel4.c	net: Remove the member netns_ok	2021-05-17 15:29:35 -07:00
udp_bpf.c	net: Implement ->sock_is_readable() for UDP and AF_UNIX	2021-10-26 12:29:33 -07:00
udp_diag.c	net: Use nlmsg_unicast() instead of netlink_unicast()	2021-07-13 09:28:29 -07:00
udp_impl.h	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
udp_offload.c	fou: remove sparse errors	2021-08-31 12:03:33 +01:00
udp_tunnel_core.c	udp_tunnel: reshuffle NETIF_F_RX_UDP_TUNNEL_PORT checks	2021-01-07 12:53:29 -08:00
udp_tunnel_nic.c	udp_tunnel: Fix end of loop test in udp_tunnel_nic_unregister()	2022-03-02 11:47:59 +01:00
udp_tunnel_stub.c	udp_tunnel: add central NIC RX port offload infrastructure	2020-07-10 13:54:00 -07:00
udp.c	net: udp: fix alignment problem in udp4_seq_show()	2022-01-11 15:35:18 +01:00
udplite.c	net: Remove the member netns_ok	2021-05-17 15:29:35 -07:00
xfrm4_input.c	xfrm: state: remove extract_input indirection from xfrm_state_afinfo	2020-05-06 09:40:08 +02:00
xfrm4_output.c	xfrm: fix unused variable warning if CONFIG_NETFILTER=n	2020-05-11 15:12:27 +02:00
xfrm4_policy.c
xfrm4_protocol.c	net: Remove the member netns_ok	2021-05-17 15:29:35 -07:00
xfrm4_state.c	xfrm: remove output_finish indirection from xfrm_state_afinfo	2020-05-06 09:40:08 +02:00
xfrm4_tunnel.c	xfrm: remove description from xfrm_type struct	2021-06-09 09:38:52 +02:00