From: David Ahern <dsahern@kernel.org>
To: Ido Schimmel <idosch@idosch.org>
Cc: kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com,
netdev@vger.kernel.org, Gwangun Jung <exsociety@gmail.com>
Subject: Re: [PATCH net] ipv4: Handle attempt to delete multipath route when fib_info contains an nh reference
Date: Wed, 5 Oct 2022 13:27:59 -0600 [thread overview]
Message-ID: <84202713-ec7c-1e5e-8d9f-d36e715c81e4@kernel.org> (raw)
In-Reply-To: <Yz3WE+cBd9YUj7Bp@shredder>
On 10/5/22 1:08 PM, Ido Schimmel wrote:
> On Wed, Oct 05, 2022 at 12:12:57PM -0600, David Ahern wrote:
>> 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.
>
> Cool bug... Managed to reproduce with:
>
> # ip nexthop add id 1 blackhole
> # ip route add 192.0.2.0/24 nhid 1
> # ip route del 192.0.2.0/24 nexthop via 198.51.100.1 nexthop via 198.51.100.2
that's what I did as well.
>
> Maybe add to tools/testing/selftests/net/fib_nexthops.sh ?
I have one in my tree, but in my tests nothing blew up or threw an error
message. It requires KASAN to be enabled otherwise the test does not
trigger anything.
>
> Checked IPv6 and I don't think we can hit it there, but I will double
> check tomorrow morning.
>
>>
>> Fixes: 493ced1ac47c ("ipv4: Allow routes to use nexthop objects")
>> Reported-by: Gwangun Jung <exsociety@gmail.com>
>> Signed-off-by: David Ahern <dsahern@kernel.org>
>> ---
>> net/ipv4/fib_semantics.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>
> There is already such a check above for the non-multipath check, maybe
> we can just move it up to cover both cases? Something like:
>
> diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
> index 2dc97583d279..e9a7f70a54df 100644
> --- a/net/ipv4/fib_semantics.c
> +++ b/net/ipv4/fib_semantics.c
> @@ -888,13 +888,13 @@ int fib_nh_match(struct net *net, struct fib_config *cfg, struct fib_info *fi,
> return 1;
> }
>
> + /* cannot match on nexthop object attributes */
> + if (fi->nh)
> + return 1;
that should work as well. I went with the simplest change that would
definitely not have a negative impact on backports.
> +
> if (cfg->fc_oif || cfg->fc_gw_family) {
> struct fib_nh *nh;
>
> - /* cannot match on nexthop object attributes */
> - if (fi->nh)
> - return 1;
> -
> nh = fib_info_nh(fi, 0);
> if (cfg->fc_encap) {
> if (fib_encap_match(net, cfg->fc_encap_type,
next prev parent reply other threads:[~2022-10-05 19:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-05 18:12 [PATCH net] ipv4: Handle attempt to delete multipath route when fib_info contains an nh reference David Ahern
2022-10-05 19:08 ` Ido Schimmel
2022-10-05 19:27 ` David Ahern [this message]
2022-10-06 6:49 ` Ido Schimmel
2022-10-06 7:29 ` Paolo Abeni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=84202713-ec7c-1e5e-8d9f-d36e715c81e4@kernel.org \
--to=dsahern@kernel.org \
--cc=davem@davemloft.net \
--cc=exsociety@gmail.com \
--cc=idosch@idosch.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).