[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <bdb865d4-57c8-34c6-21a4-e631555fc41d@kernel.org>
Date: Wed, 7 Jun 2023 10:11:04 -0600
From: David Ahern <dsahern@...nel.org>
To: Guillaume Nault <gnault@...hat.com>, David Miller <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
Eric Dumazet <edumazet@...gle.com>
Cc: netdev@...r.kernel.org, Lorenzo Colitti <lorenzo@...gle.com>,
Mirsad Todorovac <mirsad.todorovac@....unizg.hr>
Subject: Re: [PATCH net] ping6: Fix send to link-local addresses with VRF.
On 6/7/23 10:05 AM, Guillaume Nault wrote:
> Ping sockets can't send packets when they're bound to a VRF master
> device and the output interface is set to a slave device.
>
> For example, when net.ipv4.ping_group_range is properly set, so that
> ping6 can use ping sockets, the following kind of commands fails:
> $ ip vrf exec red ping6 fe80::854:e7ff:fe88:4bf1%eth1
>
> What happens is that sk->sk_bound_dev_if is set to the VRF master
> device, but 'oif' is set to the real output device. Since both are set
> but different, ping_v6_sendmsg() sees their value as inconsistent and
> fails.
>
> Fix this by allowing 'oif' to be a slave device of ->sk_bound_dev_if.
>
> This fixes the following kselftest failure:
> $ ./fcnal-test.sh -t ipv6_ping
> [...]
> TEST: ping out, vrf device+address bind - ns-B IPv6 LLA [FAIL]
Thank you for resolving that one.
>
> Reported-by: Mirsad Todorovac <mirsad.todorovac@....unizg.hr>
> Closes: https://lore.kernel.org/netdev/b6191f90-ffca-dbca-7d06-88a9788def9c@alu.unizg.hr/
> Tested-by: Mirsad Todorovac <mirsad.todorovac@....unizg.hr>
> Fixes: 5e457896986e ("net: ipv6: Fix ping to link-local addresses.")
> Signed-off-by: Guillaume Nault <gnault@...hat.com>
> ---
> net/ipv6/ping.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
> index c4835dbdfcff..f804c11e2146 100644
> --- a/net/ipv6/ping.c
> +++ b/net/ipv6/ping.c
> @@ -114,7 +114,8 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
> addr_type = ipv6_addr_type(daddr);
> if ((__ipv6_addr_needs_scope_id(addr_type) && !oif) ||
> (addr_type & IPV6_ADDR_MAPPED) ||
> - (oif && sk->sk_bound_dev_if && oif != sk->sk_bound_dev_if))
> + (oif && sk->sk_bound_dev_if && oif != sk->sk_bound_dev_if &&
> + l3mdev_master_ifindex_by_index(sock_net(sk), oif) != sk->sk_bound_dev_if))
> return -EINVAL;
>
> ipcm6_init_sk(&ipc6, np);
Reviewed-by: David Ahern <dsahern@...nel.org>
Powered by blists - more mailing lists