diff options
author | Willem de Bruijn <willemb@google.com> | 2017-02-18 19:00:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-18 22:55:13 -0500 |
commit | 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 (patch) | |
tree | 520f6e8a62d858a0d52ac02812bb20156b563d87 | |
parent | 2763f92f858f7c4c3198335c0542726eaed07ba3 (diff) |
ipv6: release dst on error in ip6_dst_lookup_tail
If ip6_dst_lookup_tail has acquired a dst and fails the IPv4-mapped
check, release the dst before returning an error.
Fixes: ec5e3b0a1d41 ("ipv6: Inhibit IPv4-mapped src address on the wire.")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv6/ip6_output.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index e164684456df..7cebee58e55b 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -1022,8 +1022,10 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk, | |||
1022 | } | 1022 | } |
1023 | #endif | 1023 | #endif |
1024 | if (ipv6_addr_v4mapped(&fl6->saddr) && | 1024 | if (ipv6_addr_v4mapped(&fl6->saddr) && |
1025 | !(ipv6_addr_v4mapped(&fl6->daddr) || ipv6_addr_any(&fl6->daddr))) | 1025 | !(ipv6_addr_v4mapped(&fl6->daddr) || ipv6_addr_any(&fl6->daddr))) { |
1026 | return -EAFNOSUPPORT; | 1026 | err = -EAFNOSUPPORT; |
1027 | goto out_err_release; | ||
1028 | } | ||
1027 | 1029 | ||
1028 | return 0; | 1030 | return 0; |
1029 | 1031 | ||