diff options
| author | Willem de Bruijn <willemb@google.com> | 2017-02-18 19:00:45 -0500 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-07-31 13:37:48 -0400 |
| commit | 0b8c350c4da2f01b5256adfc9833b81ec6d495b7 (patch) | |
| tree | 421e399bdf5a0a64f9bb9774c0d32bbf7abe2a35 /net | |
| parent | eccc7d3c652496005f205ac4f249eb4460711bcb (diff) | |
ipv6: release dst on error in ip6_dst_lookup_tail
[ Upstream commit 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to '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 f91ee783a5fd..eefb8759cfa4 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -978,8 +978,10 @@ static int ip6_dst_lookup_tail(struct sock *sk, } #endif if (ipv6_addr_v4mapped(&fl6->saddr) && - !(ipv6_addr_v4mapped(&fl6->daddr) || ipv6_addr_any(&fl6->daddr))) - return -EAFNOSUPPORT; + !(ipv6_addr_v4mapped(&fl6->daddr) || ipv6_addr_any(&fl6->daddr))) { + err = -EAFNOSUPPORT; + goto out_err_release; + } return 0; |