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/tcp_ipv6.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/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 711d209f9124..f443c6b0ce16 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -810,8 +810,13 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 fl6.flowi6_proto = IPPROTO_TCP; if (rt6_need_strict(&fl6.daddr) && !oif) fl6.flowi6_oif = tcp_v6_iif(skb); - else + else { + if (!oif && netif_index_is_l3_master(net, skb->skb_iif)) + oif = skb->skb_iif; + fl6.flowi6_oif = oif; + } + fl6.flowi6_mark = IP6_REPLY_MARK(net, skb->mark); fl6.fl6_dport = t1->dest; fl6.fl6_sport = t1->source; |