Skip to content

Commit a963a37

Browse files
Eric Dumazetdavem330
authored andcommitted
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>
1 parent 5dbe7c1 commit a963a37

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

net/ipv6/ip6_output.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,11 +821,17 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk,
821821
const struct flowi6 *fl6)
822822
{
823823
struct ipv6_pinfo *np = inet6_sk(sk);
824-
struct rt6_info *rt = (struct rt6_info *)dst;
824+
struct rt6_info *rt;
825825

826826
if (!dst)
827827
goto out;
828828

829+
if (dst->ops->family != AF_INET6) {
830+
dst_release(dst);
831+
return NULL;
832+
}
833+
834+
rt = (struct rt6_info *)dst;
829835
/* Yes, checking route validity in not connected
830836
* case is not very simple. Take into account,
831837
* that we do not support routing by source, TOS,

0 commit comments

Comments
 (0)