Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ipv4: Handle attempt to delete multipath route when fib_info contains an nh reference

Gwangun Jung reported a slab-out-of-bounds access in fib_nh_match:
fib_nh_match+0xf98/0x1130 linux-6.0-rc7/net/ipv4/fib_semantics.c:961
fib_table_delete+0x5f3/0xa40 linux-6.0-rc7/net/ipv4/fib_trie.c:1753
inet_rtm_delroute+0x2b3/0x380 linux-6.0-rc7/net/ipv4/fib_frontend.c:874

Separate nexthop objects are mutually exclusive with the legacy
multipath spec. Fix fib_nh_match to return if the config for the
to be deleted route contains a multipath spec while the fib_info
is using a nexthop object.

Fixes: 493ced1ac47c ("ipv4: Allow routes to use nexthop objects")
Fixes: 6bf92d70e690 ("net: ipv4: fix route with nexthop object delete warning")
Reported-by: Gwangun Jung <exsociety@gmail.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Tested-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

David Ahern and committed by
David S. Miller
61b91eb3 3030cbff

+9 -4
+4 -4
net/ipv4/fib_semantics.c
··· 888 888 return 1; 889 889 } 890 890 891 + /* cannot match on nexthop object attributes */ 892 + if (fi->nh) 893 + return 1; 894 + 891 895 if (cfg->fc_oif || cfg->fc_gw_family) { 892 896 struct fib_nh *nh; 893 - 894 - /* cannot match on nexthop object attributes */ 895 - if (fi->nh) 896 - return 1; 897 897 898 898 nh = fib_info_nh(fi, 0); 899 899 if (cfg->fc_encap) {
+5
tools/testing/selftests/net/fib_nexthops.sh
··· 1223 1223 log_test $rc 0 "Delete nexthop route warning" 1224 1224 run_cmd "$IP route delete 172.16.101.1/32 nhid 12" 1225 1225 run_cmd "$IP nexthop del id 12" 1226 + 1227 + run_cmd "$IP nexthop add id 21 via 172.16.1.6 dev veth1" 1228 + run_cmd "$IP ro add 172.16.101.0/24 nhid 21" 1229 + run_cmd "$IP ro del 172.16.101.0/24 nexthop via 172.16.1.7 dev veth1 nexthop via 172.16.1.8 dev veth1" 1230 + log_test $? 2 "Delete multipath route with only nh id based entry" 1226 1231 } 1227 1232 1228 1233 ipv4_grp_fcnal()