Commit 199ab00f authored Apr 25, 2017 by WANG Cong Committed by David S. Miller Apr 26, 2017

ipv6: check skb->protocol before lookup for nexthop



Andrey reported a out-of-bound access in ip6_tnl_xmit(), this
is because we use an ipv4 dst in ip6_tnl_xmit() and cast an IPv4
neigh key as an IPv6 address:

        neigh = dst_neigh_lookup(skb_dst(skb),
                                 &ipv6_hdr(skb)->daddr);
        if (!neigh)
                goto tx_err_link_failure;

        addr6 = (struct in6_addr *)&neigh->primary_key; // <=== HERE
        addr_type = ipv6_addr_type(addr6);

        if (addr_type == IPV6_ADDR_ANY)
                addr6 = &ipv6_hdr(skb)->daddr;

        memcpy(&fl6->daddr, addr6, sizeof(fl6->daddr));

Also the network header of the skb at this point should be still IPv4
for 4in6 tunnels, we shold not just use it as IPv6 header.

This patch fixes it by checking if skb->protocol is ETH_P_IPV6: if it
is, we are safe to do the nexthop lookup using skb_dst() and
ipv6_hdr(skb)->daddr; if not (aka IPv4), we have no clue about which
dest address we can pick here, we have to rely on callers to fill it
from tunnel config, so just fall to ip6_route_output() to make the
decision.

Fixes: ea3dc960 ("ip6_tunnel: Add support for wildcard tunnel endpoints.")
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9899886d

net/ipv6/ip6_tunnel.c

+18 −16

Original line number	Diff line number	Diff line
		@@ -1037,7 +1037,7 @@ int ip6_tnl_xmit(struct sk_buff skb, struct net_device dev, __u8 dsfield,
		struct ip6_tnl *t = netdev_priv(dev);
		struct net *net = t->net;
		struct net_device_stats *stats = &t->dev->stats;
		struct ipv6hdr *ipv6h = ipv6_hdr(skb);
		struct ipv6hdr *ipv6h;
		struct ipv6_tel_txoption opt;
		struct dst_entry dst = NULL, ndst = NULL;
		struct net_device *tdev;
		@@ -1057,6 +1057,7 @@ int ip6_tnl_xmit(struct sk_buff skb, struct net_device dev, __u8 dsfield,

		/* NBMA tunnel */
		if (ipv6_addr_any(&t->parms.raddr)) {
		if (skb->protocol == htons(ETH_P_IPV6)) {
		struct in6_addr *addr6;
		struct neighbour *neigh;
		int addr_type;
		@@ -1077,6 +1078,7 @@ int ip6_tnl_xmit(struct sk_buff skb, struct net_device dev, __u8 dsfield,

		memcpy(&fl6->daddr, addr6, sizeof(fl6->daddr));
		neigh_release(neigh);
		}
		} else if (!(t->parms.flags &
		(IP6_TNL_F_USE_ORIG_TCLASS \| IP6_TNL_F_USE_ORIG_FWMARK))) {
		/* enable the cache only only if the routing decision does

Admin message