summary refs log tree commit diff
path: root/net/ipv6
diff options
context:
space:
mode:
authorJonathan T. Leighton <jtleight@udel.edu>2017-02-12 17:26:06 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-14 12:13:51 -0500
commitec5e3b0a1d41fbda0cc33a45bc9e54e91d9d12c7 (patch)
tree073570df5576806b266c2fc101f88b5c50be564f /net/ipv6
parentfed06ee89b78d3af32e235e0e89ad0d946fcb95d (diff)
downloadlinux-ec5e3b0a1d41fbda0cc33a45bc9e54e91d9d12c7.tar.gz
ipv6: Inhibit IPv4-mapped src address on the wire.
This patch adds a check for the problematic case of an IPv4-mapped IPv6
source address and a destination address that is neither an IPv4-mapped
IPv6 address nor in6addr_any, and returns an appropriate error. The
check in done before returning from looking up the route.

Signed-off-by: Jonathan T. Leighton <jtleight@udel.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6_output.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index b6a94ff0bbd0..e164684456df 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1021,6 +1021,9 @@ 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;
 
 	return 0;