]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ipv6: release dst on error in ip6_dst_lookup_tail
authorWillem de Bruijn <willemb@google.com>
Sun, 19 Feb 2017 00:00:45 +0000 (19:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 19 Feb 2017 03:55:13 +0000 (22:55 -0500)
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>
net/ipv6/ip6_output.c

index e164684456df830c411781810f80e8e7c176d636..7cebee58e55b7f6f23279ac2515a69df936b5712 100644 (file)
@@ -1022,8 +1022,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;