net: allow traceroute with a specified interface in a vrf (f64bf6b8) · Commits · 戴 / test

Traceroute executed in a vrf succeeds if no device is given or if the vrf is given as the device, but fails if the interface is given as the device. This is for default UDP probes, it succeeds for TCP SYN or ICMP ECHO probes. As the skb bound dev is the interface and the sk dev is the vrf, sk lookup fails for ICMP_DEST_UNREACH and ICMP_TIME_EXCEEDED messages. The solution is for the secondary dev to be passed so that the interface is available for the device match to succeed, in the same way as is already done for non-error cases. Signed-off-by:

Mike Manning <mmanning@vyatta.att-mail.com> Reviewed-by:

David Ahern <dsahern@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv4/udp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -609,8 +609,8 @@ void __udp4_lib_err(struct sk_buff skb, u32 info, struct udp_table udptable)
		struct net *net = dev_net(skb->dev);

		sk = __udp4_lib_lookup(net, iph->daddr, uh->dest,
		iph->saddr, uh->source, skb->dev->ifindex, 0,
		udptable, NULL);
		iph->saddr, uh->source, skb->dev->ifindex,
		inet_sdif(skb), udptable, NULL);
		if (!sk) {
		__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);
		return; /* No socket for error */

net/ipv6/udp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -478,7 +478,7 @@ void __udp6_lib_err(struct sk_buff skb, struct inet6_skb_parm opt,
		struct net *net = dev_net(skb->dev);

		sk = __udp6_lib_lookup(net, daddr, uh->dest, saddr, uh->source,
		inet6_iif(skb), 0, udptable, skb);
		inet6_iif(skb), inet6_sdif(skb), udptable, skb);
		if (!sk) {
		__ICMP6_INC_STATS(net, __in6_dev_get(skb->dev),
		ICMP6_MIB_INERRORS);

Admin message