diff options
author | Eric Dumazet <edumazet@google.com> | 2013-06-26 07:15:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-26 18:13:47 -0400 |
commit | a963a37d384d71ad43b3e9e79d68d42fbe0901f3 (patch) | |
tree | dbcde09eab1cfe02ef8bf35471e5c97ec489589c /net/ipv6 | |
parent | 5dbe7c178d3f0a4634f088d9e729f1909b9ddcd1 (diff) |
ipv6: ip6_sk_dst_check() must not assume ipv6 dst
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 <davej@redhat.com>
Reported-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_output.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 95703ba2c084..d5d20cde8d92 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -821,11 +821,17 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk, | |||
821 | const struct flowi6 *fl6) | 821 | const struct flowi6 *fl6) |
822 | { | 822 | { |
823 | struct ipv6_pinfo *np = inet6_sk(sk); | 823 | struct ipv6_pinfo *np = inet6_sk(sk); |
824 | struct rt6_info *rt = (struct rt6_info *)dst; | 824 | struct rt6_info *rt; |
825 | 825 | ||
826 | if (!dst) | 826 | if (!dst) |
827 | goto out; | 827 | goto out; |
828 | 828 | ||
829 | if (dst->ops->family != AF_INET6) { | ||
830 | dst_release(dst); | ||
831 | return NULL; | ||
832 | } | ||
833 | |||
834 | rt = (struct rt6_info *)dst; | ||
829 | /* Yes, checking route validity in not connected | 835 | /* Yes, checking route validity in not connected |
830 | * case is not very simple. Take into account, | 836 | * case is not very simple. Take into account, |
831 | * that we do not support routing by source, TOS, | 837 | * that we do not support routing by source, TOS, |