| Message ID | 20220429082021.10294-1-nicolas.dichtel@6wind.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net,v2] ping: fix address binding wrt vrf | expand |
Le 29/04/2022 à 16:31, David Ahern a écrit : > On 4/29/22 2:20 AM, Nicolas Dichtel wrote: >> When ping_group_range is updated, 'ping' uses the DGRAM ICMP socket, >> instead of an IP raw socket. In this case, 'ping' is unable to bind its >> socket to a local address owned by a vrflite. >> >> Before the patch: >> $ sysctl -w net.ipv4.ping_group_range='0 2147483647' >> $ ip link add blue type vrf table 10 >> $ ip link add foo type dummy >> $ ip link set foo master blue >> $ ip link set foo up >> $ ip addr add 192.168.1.1/24 dev foo >> $ ip vrf exec blue ping -c1 -I 192.168.1.1 192.168.1.2 >> ping: bind: Cannot assign requested address >> >> CC: stable@vger.kernel.org >> Fixes: 1b69c6d0ae90 ("net: Introduce L3 Master device abstraction") >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> >> --- >> >> v1 -> v2: >> add the tag "Cc: stable@vger.kernel.org" for correct stable submission >> >> net/ipv4/ping.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> > > please add a test case to fcnal-test.sh. Does ipv6 work ok? Indeed, ipv6 is missing. I will add some test cases. Modifying the sysctl before the vrf tests produce a lot of failures: With VRF SYSCTL: net.ipv4.raw_l3mdev_accept=1 SYSCTL: net.ipv4.ping_group_range=0 2147483647 TEST: ping out, VRF bind - ns-B IP [ OK ] TEST: ping out, device bind - ns-B IP [FAIL] TEST: ping out, vrf device + dev address bind - ns-B IP [FAIL] TEST: ping out, vrf device + dev address bind - ns-B IP [FAIL] TEST: ping out, vrf device + vrf address bind - ns-B IP [FAIL] TEST: ping out, VRF bind - ns-B loopback IP [ OK ] TEST: ping out, device bind - ns-B loopback IP [FAIL] TEST: ping out, vrf device + dev address bind - ns-B loopback IP [FAIL] TEST: ping out, vrf device + dev address bind - ns-B loopback IP [FAIL] TEST: ping out, vrf device + vrf address bind - ns-B loopback IP [FAIL] Regards, Nicolas
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 3ee947557b88..9ea326b50775 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -305,6 +305,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk, struct net *net = sock_net(sk); if (sk->sk_family == AF_INET) { struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; + u32 tb_id = RT_TABLE_LOCAL; int chk_addr_ret; if (addr_len < sizeof(*addr)) @@ -318,7 +319,8 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk, pr_debug("ping_check_bind_addr(sk=%p,addr=%pI4,port=%d)\n", sk, &addr->sin_addr.s_addr, ntohs(addr->sin_port)); - chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr); + tb_id = l3mdev_fib_table_by_index(net, sk->sk_bound_dev_if) ? : tb_id; + chk_addr_ret = inet_addr_type_table(net, addr->sin_addr.s_addr, tb_id); if (!inet_addr_valid_or_nonlocal(net, inet_sk(sk), addr->sin_addr.s_addr,
When ping_group_range is updated, 'ping' uses the DGRAM ICMP socket, instead of an IP raw socket. In this case, 'ping' is unable to bind its socket to a local address owned by a vrflite. Before the patch: $ sysctl -w net.ipv4.ping_group_range='0 2147483647' $ ip link add blue type vrf table 10 $ ip link add foo type dummy $ ip link set foo master blue $ ip link set foo up $ ip addr add 192.168.1.1/24 dev foo $ ip vrf exec blue ping -c1 -I 192.168.1.1 192.168.1.2 ping: bind: Cannot assign requested address CC: stable@vger.kernel.org Fixes: 1b69c6d0ae90 ("net: Introduce L3 Master device abstraction") Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- v1 -> v2: add the tag "Cc: stable@vger.kernel.org" for correct stable submission net/ipv4/ping.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)