Commit 09db1f67 authored by WANG Cong's avatar WANG Cong Committed by Kelsey Skunberg

ipv6: check skb->protocol before lookup for nexthop

BugLink: https://bugs.launchpad.net/bugs/1892822

commit 199ab00f upstream.

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: default avatarAndrey Konovalov <andreyknvl@google.com>
Tested-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAlessio Balsini <balsini@android.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarIan May <ian.may@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent d89bf5af
...@@ -972,26 +972,28 @@ static int ip6_tnl_xmit2(struct sk_buff *skb, ...@@ -972,26 +972,28 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
/* NBMA tunnel */ /* NBMA tunnel */
if (ipv6_addr_any(&t->parms.raddr)) { if (ipv6_addr_any(&t->parms.raddr)) {
struct in6_addr *addr6; if (skb->protocol == htons(ETH_P_IPV6)) {
struct neighbour *neigh; struct in6_addr *addr6;
int addr_type; struct neighbour *neigh;
int addr_type;
if (!skb_dst(skb)) if (!skb_dst(skb))
goto tx_err_link_failure; goto tx_err_link_failure;
neigh = dst_neigh_lookup(skb_dst(skb), neigh = dst_neigh_lookup(skb_dst(skb),
&ipv6_hdr(skb)->daddr); &ipv6_hdr(skb)->daddr);
if (!neigh) if (!neigh)
goto tx_err_link_failure; goto tx_err_link_failure;
addr6 = (struct in6_addr *)&neigh->primary_key; addr6 = (struct in6_addr *)&neigh->primary_key;
addr_type = ipv6_addr_type(addr6); addr_type = ipv6_addr_type(addr6);
if (addr_type == IPV6_ADDR_ANY) if (addr_type == IPV6_ADDR_ANY)
addr6 = &ipv6_hdr(skb)->daddr; addr6 = &ipv6_hdr(skb)->daddr;
memcpy(&fl6->daddr, addr6, sizeof(fl6->daddr)); memcpy(&fl6->daddr, addr6, sizeof(fl6->daddr));
neigh_release(neigh); neigh_release(neigh);
}
} else if (!fl6->flowi6_mark) } else if (!fl6->flowi6_mark)
dst = dst_cache_get(&t->dst_cache); dst = dst_cache_get(&t->dst_cache);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment