diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2016-05-04 21:26:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-06 15:49:07 -0400 |
| commit | 1d2f7b2d956e242179aaf4a08f3545f99c81f9a3 (patch) | |
| tree | 7d8e72c0dc054642d059c695b581572fb30bd91c /net/ipv6/icmp.c | |
| parent | 856ce5d083e14571d051301fe3c65b32b8cbe321 (diff) | |
| download | lwn-1d2f7b2d956e242179aaf4a08f3545f99c81f9a3.tar.gz lwn-1d2f7b2d956e242179aaf4a08f3545f99c81f9a3.zip | |
net: ipv6: tcp reset, icmp need to consider L3 domain
Responses for packets to unused ports are getting lost with L3 domains.
IPv4 has ip_send_unicast_reply for sending TCP responses which accounts
for L3 domains; update the IPv6 counterpart tcp_v6_send_response.
For icmp the L3 master check needs to be moved up in icmp6_send
to properly respond to UDP packets to a port with no listener.
Fixes: ca254490c8df ("net: Add VRF support to IPv6 stack")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 0a37ddc7af51..0013cacf7164 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -445,6 +445,8 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) if (__ipv6_addr_needs_scope_id(addr_type)) iif = skb->dev->ifindex; + else + iif = l3mdev_master_ifindex(skb->dev); /* * Must not send error if the source does not uniquely @@ -499,9 +501,6 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) else if (!fl6.flowi6_oif) fl6.flowi6_oif = np->ucast_oif; - if (!fl6.flowi6_oif) - fl6.flowi6_oif = l3mdev_master_ifindex(skb->dev); - dst = icmpv6_route_lookup(net, skb, sk, &fl6); if (IS_ERR(dst)) goto out; |