From: Eric Dumazet Date: Wed, 26 Jun 2013 11:15:07 +0000 (+0000) Subject: ipv6: ip6_sk_dst_check() must not assume ipv6 dst X-Git-Tag: v2.6.32.62~130 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42b682e8e122f4509823e97b5d9936a684225a2c;p=people%2Fms%2Flinux.git ipv6: ip6_sk_dst_check() must not assume ipv6 dst commit a963a37d384d71ad43b3e9e79d68d42fbe0901f3 upstream It's possible to use AF_INET6 sockets and to connect to an IPv4 destination. After this, socket dst cache is a pointer to a rtable, not rt6_info. ip6_sk_dst_check() should check the socket dst cache is IPv6, or else various corruptions/crashes can happen. Dave Jones can reproduce immediate crash with trinity -q -l off -n -c sendmsg -c connect With help from Hannes Frederic Sowa Reported-by: Dave Jones Reported-by: Hannes Frederic Sowa Signed-off-by: Eric Dumazet Acked-by: Hannes Frederic Sowa Signed-off-by: David S. Miller Signed-off-by: Willy Tarreau --- diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 6ba0fe27baf0..bba91a14af9d 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -920,11 +920,17 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk, struct flowi *fl) { struct ipv6_pinfo *np = inet6_sk(sk); - struct rt6_info *rt = (struct rt6_info *)dst; + struct rt6_info *rt; if (!dst) goto out; + if (dst->ops->family != AF_INET6) { + dst_release(dst); + return NULL; + } + + rt = (struct rt6_info *)dst; /* Yes, checking route validity in not connected * case is not very simple. Take into account, * that we do not support routing by source, TOS,