summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-19 19:18:46 +0300
committerDavid S. Miller <davem@davemloft.net>2017-02-19 19:18:46 +0300
commitf787d1debf63f78a15b2d1c79e7f1788c4fadfa0 (patch)
tree97811cde0b0b3f3f32af3eb48516d539d60573f5 /net/ipv6
parent4e33e34625103593a71d2bae471ce49cef62ef06 (diff)
parent00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 (diff)
downloadlinux-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6_output.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d0f51b420447..528b3c1f3fde 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1023,8 +1023,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;