diff options
| author | Willem de Bruijn <willemb@google.com> | 2017-02-18 19:00:45 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-05 14:40:13 +0200 |
| commit | 98184bbb8daea6af32208d63831e66023db4bb58 (patch) | |
| tree | 2665d67124b5f5735ec6a0af7e8111024ba768ca /net/ipv6 | |
| parent | 92905e331aea278665c4b27fbb13c4547a8bcbb0 (diff) | |
| download | linux-stable-98184bbb8daea6af32208d63831e66023db4bb58.tar.gz linux-stable-98184bbb8daea6af32208d63831e66023db4bb58.tar.bz2 linux-stable-98184bbb8daea6af32208d63831e66023db4bb58.zip | |
ipv6: release dst on error in ip6_dst_lookup_tail
commit 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 upstream.
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>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
| -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 3ab32ac57ccd..fd649599620e 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1020,8 +1020,10 @@ static int ip6_dst_lookup_tail(struct net *net, const 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; |