net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup
ipv6_stub uses the ip6_dst_lookup function to allow other modules to
perform IPv6 lookups. However, this function skips the XFRM layer
entirely.
All users of ipv6_stub->ip6_dst_lookup use ip_route_output_flow (via the
ip_route_output_key and ip_route_output helpers) for their IPv4 lookups,
which calls xfrm_lookup_route(). This patch fixes this inconsistent
behavior by switching the stub to ip6_dst_lookup_flow, which also calls
xfrm_lookup_route().
This requires some changes in all the callers, as these two functions
take different arguments and have different return types.
Fixes: 5f81bd2e5d
("ipv6: export a stub for IPv6 symbols used by vxlan")
Reported-by: Xiumei Mu <xmu@redhat.com>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
alistair/sunxi64-5.5-dsi
parent
c4e85f73af
commit
6c8991f415
|
@ -421,16 +421,15 @@ static int addr6_resolve(struct sockaddr *src_sock,
|
||||||
(const struct sockaddr_in6 *)dst_sock;
|
(const struct sockaddr_in6 *)dst_sock;
|
||||||
struct flowi6 fl6;
|
struct flowi6 fl6;
|
||||||
struct dst_entry *dst;
|
struct dst_entry *dst;
|
||||||
int ret;
|
|
||||||
|
|
||||||
memset(&fl6, 0, sizeof fl6);
|
memset(&fl6, 0, sizeof fl6);
|
||||||
fl6.daddr = dst_in->sin6_addr;
|
fl6.daddr = dst_in->sin6_addr;
|
||||||
fl6.saddr = src_in->sin6_addr;
|
fl6.saddr = src_in->sin6_addr;
|
||||||
fl6.flowi6_oif = addr->bound_dev_if;
|
fl6.flowi6_oif = addr->bound_dev_if;
|
||||||
|
|
||||||
ret = ipv6_stub->ipv6_dst_lookup(addr->net, NULL, &dst, &fl6);
|
dst = ipv6_stub->ipv6_dst_lookup_flow(addr->net, NULL, &fl6, NULL);
|
||||||
if (ret < 0)
|
if (IS_ERR(dst))
|
||||||
return ret;
|
return PTR_ERR(dst);
|
||||||
|
|
||||||
if (ipv6_addr_any(&src_in->sin6_addr))
|
if (ipv6_addr_any(&src_in->sin6_addr))
|
||||||
src_in->sin6_addr = fl6.saddr;
|
src_in->sin6_addr = fl6.saddr;
|
||||||
|
|
|
@ -117,10 +117,12 @@ static struct dst_entry *rxe_find_route6(struct net_device *ndev,
|
||||||
memcpy(&fl6.daddr, daddr, sizeof(*daddr));
|
memcpy(&fl6.daddr, daddr, sizeof(*daddr));
|
||||||
fl6.flowi6_proto = IPPROTO_UDP;
|
fl6.flowi6_proto = IPPROTO_UDP;
|
||||||
|
|
||||||
if (unlikely(ipv6_stub->ipv6_dst_lookup(sock_net(recv_sockets.sk6->sk),
|
ndst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(recv_sockets.sk6->sk),
|
||||||
recv_sockets.sk6->sk, &ndst, &fl6))) {
|
recv_sockets.sk6->sk, &fl6,
|
||||||
|
NULL);
|
||||||
|
if (unlikely(IS_ERR(ndst))) {
|
||||||
pr_err_ratelimited("no route to %pI6\n", daddr);
|
pr_err_ratelimited("no route to %pI6\n", daddr);
|
||||||
goto put;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unlikely(ndst->error)) {
|
if (unlikely(ndst->error)) {
|
||||||
|
|
|
@ -297,10 +297,10 @@ static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv,
|
||||||
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = ipv6_stub->ipv6_dst_lookup(dev_net(mirred_dev), NULL, &dst,
|
dst = ipv6_stub->ipv6_dst_lookup_flow(dev_net(mirred_dev), NULL, fl6,
|
||||||
fl6);
|
NULL);
|
||||||
if (ret < 0)
|
if (IS_ERR(dst))
|
||||||
return ret;
|
return PTR_ERR(dst);
|
||||||
|
|
||||||
if (!(*out_ttl))
|
if (!(*out_ttl))
|
||||||
*out_ttl = ip6_dst_hoplimit(dst);
|
*out_ttl = ip6_dst_hoplimit(dst);
|
||||||
|
|
|
@ -853,7 +853,9 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb,
|
||||||
if (dst)
|
if (dst)
|
||||||
return dst;
|
return dst;
|
||||||
}
|
}
|
||||||
if (ipv6_stub->ipv6_dst_lookup(geneve->net, gs6->sock->sk, &dst, fl6)) {
|
dst = ipv6_stub->ipv6_dst_lookup_flow(geneve->net, gs6->sock->sk, fl6,
|
||||||
|
NULL);
|
||||||
|
if (IS_ERR(dst)) {
|
||||||
netdev_dbg(dev, "no route to %pI6\n", &fl6->daddr);
|
netdev_dbg(dev, "no route to %pI6\n", &fl6->daddr);
|
||||||
return ERR_PTR(-ENETUNREACH);
|
return ERR_PTR(-ENETUNREACH);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2275,7 +2275,6 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
|
||||||
bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
|
bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
|
||||||
struct dst_entry *ndst;
|
struct dst_entry *ndst;
|
||||||
struct flowi6 fl6;
|
struct flowi6 fl6;
|
||||||
int err;
|
|
||||||
|
|
||||||
if (!sock6)
|
if (!sock6)
|
||||||
return ERR_PTR(-EIO);
|
return ERR_PTR(-EIO);
|
||||||
|
@ -2298,10 +2297,9 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
|
||||||
fl6.fl6_dport = dport;
|
fl6.fl6_dport = dport;
|
||||||
fl6.fl6_sport = sport;
|
fl6.fl6_sport = sport;
|
||||||
|
|
||||||
err = ipv6_stub->ipv6_dst_lookup(vxlan->net,
|
ndst = ipv6_stub->ipv6_dst_lookup_flow(vxlan->net, sock6->sock->sk,
|
||||||
sock6->sock->sk,
|
&fl6, NULL);
|
||||||
&ndst, &fl6);
|
if (unlikely(IS_ERR(ndst))) {
|
||||||
if (unlikely(err < 0)) {
|
|
||||||
netdev_dbg(dev, "no route to %pI6\n", daddr);
|
netdev_dbg(dev, "no route to %pI6\n", daddr);
|
||||||
return ERR_PTR(-ENETUNREACH);
|
return ERR_PTR(-ENETUNREACH);
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,8 +24,10 @@ struct ipv6_stub {
|
||||||
const struct in6_addr *addr);
|
const struct in6_addr *addr);
|
||||||
int (*ipv6_sock_mc_drop)(struct sock *sk, int ifindex,
|
int (*ipv6_sock_mc_drop)(struct sock *sk, int ifindex,
|
||||||
const struct in6_addr *addr);
|
const struct in6_addr *addr);
|
||||||
int (*ipv6_dst_lookup)(struct net *net, struct sock *sk,
|
struct dst_entry *(*ipv6_dst_lookup_flow)(struct net *net,
|
||||||
struct dst_entry **dst, struct flowi6 *fl6);
|
const struct sock *sk,
|
||||||
|
struct flowi6 *fl6,
|
||||||
|
const struct in6_addr *final_dst);
|
||||||
int (*ipv6_route_input)(struct sk_buff *skb);
|
int (*ipv6_route_input)(struct sk_buff *skb);
|
||||||
|
|
||||||
struct fib6_table *(*fib6_get_table)(struct net *net, u32 id);
|
struct fib6_table *(*fib6_get_table)(struct net *net, u32 id);
|
||||||
|
|
|
@ -230,9 +230,7 @@ static int bpf_lwt_xmit_reroute(struct sk_buff *skb)
|
||||||
fl6.daddr = iph6->daddr;
|
fl6.daddr = iph6->daddr;
|
||||||
fl6.saddr = iph6->saddr;
|
fl6.saddr = iph6->saddr;
|
||||||
|
|
||||||
err = ipv6_stub->ipv6_dst_lookup(net, skb->sk, &dst, &fl6);
|
dst = ipv6_stub->ipv6_dst_lookup_flow(net, skb->sk, &fl6, NULL);
|
||||||
if (unlikely(err))
|
|
||||||
goto err;
|
|
||||||
if (IS_ERR(dst)) {
|
if (IS_ERR(dst)) {
|
||||||
err = PTR_ERR(dst);
|
err = PTR_ERR(dst);
|
||||||
goto err;
|
goto err;
|
||||||
|
|
|
@ -129,11 +129,12 @@ int inet6addr_validator_notifier_call_chain(unsigned long val, void *v)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(inet6addr_validator_notifier_call_chain);
|
EXPORT_SYMBOL(inet6addr_validator_notifier_call_chain);
|
||||||
|
|
||||||
static int eafnosupport_ipv6_dst_lookup(struct net *net, struct sock *u1,
|
static struct dst_entry *eafnosupport_ipv6_dst_lookup_flow(struct net *net,
|
||||||
struct dst_entry **u2,
|
const struct sock *sk,
|
||||||
struct flowi6 *u3)
|
struct flowi6 *fl6,
|
||||||
|
const struct in6_addr *final_dst)
|
||||||
{
|
{
|
||||||
return -EAFNOSUPPORT;
|
return ERR_PTR(-EAFNOSUPPORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int eafnosupport_ipv6_route_input(struct sk_buff *skb)
|
static int eafnosupport_ipv6_route_input(struct sk_buff *skb)
|
||||||
|
@ -190,7 +191,7 @@ static int eafnosupport_ip6_del_rt(struct net *net, struct fib6_info *rt)
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct ipv6_stub *ipv6_stub __read_mostly = &(struct ipv6_stub) {
|
const struct ipv6_stub *ipv6_stub __read_mostly = &(struct ipv6_stub) {
|
||||||
.ipv6_dst_lookup = eafnosupport_ipv6_dst_lookup,
|
.ipv6_dst_lookup_flow = eafnosupport_ipv6_dst_lookup_flow,
|
||||||
.ipv6_route_input = eafnosupport_ipv6_route_input,
|
.ipv6_route_input = eafnosupport_ipv6_route_input,
|
||||||
.fib6_get_table = eafnosupport_fib6_get_table,
|
.fib6_get_table = eafnosupport_fib6_get_table,
|
||||||
.fib6_table_lookup = eafnosupport_fib6_table_lookup,
|
.fib6_table_lookup = eafnosupport_fib6_table_lookup,
|
||||||
|
|
|
@ -946,7 +946,7 @@ static int ipv6_route_input(struct sk_buff *skb)
|
||||||
static const struct ipv6_stub ipv6_stub_impl = {
|
static const struct ipv6_stub ipv6_stub_impl = {
|
||||||
.ipv6_sock_mc_join = ipv6_sock_mc_join,
|
.ipv6_sock_mc_join = ipv6_sock_mc_join,
|
||||||
.ipv6_sock_mc_drop = ipv6_sock_mc_drop,
|
.ipv6_sock_mc_drop = ipv6_sock_mc_drop,
|
||||||
.ipv6_dst_lookup = ip6_dst_lookup,
|
.ipv6_dst_lookup_flow = ip6_dst_lookup_flow,
|
||||||
.ipv6_route_input = ipv6_route_input,
|
.ipv6_route_input = ipv6_route_input,
|
||||||
.fib6_get_table = fib6_get_table,
|
.fib6_get_table = fib6_get_table,
|
||||||
.fib6_table_lookup = fib6_table_lookup,
|
.fib6_table_lookup = fib6_table_lookup,
|
||||||
|
|
|
@ -617,16 +617,15 @@ static struct net_device *inet6_fib_lookup_dev(struct net *net,
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
struct dst_entry *dst;
|
struct dst_entry *dst;
|
||||||
struct flowi6 fl6;
|
struct flowi6 fl6;
|
||||||
int err;
|
|
||||||
|
|
||||||
if (!ipv6_stub)
|
if (!ipv6_stub)
|
||||||
return ERR_PTR(-EAFNOSUPPORT);
|
return ERR_PTR(-EAFNOSUPPORT);
|
||||||
|
|
||||||
memset(&fl6, 0, sizeof(fl6));
|
memset(&fl6, 0, sizeof(fl6));
|
||||||
memcpy(&fl6.daddr, addr, sizeof(struct in6_addr));
|
memcpy(&fl6.daddr, addr, sizeof(struct in6_addr));
|
||||||
err = ipv6_stub->ipv6_dst_lookup(net, NULL, &dst, &fl6);
|
dst = ipv6_stub->ipv6_dst_lookup_flow(net, NULL, &fl6, NULL);
|
||||||
if (err)
|
if (IS_ERR(dst))
|
||||||
return ERR_PTR(err);
|
return ERR_CAST(dst);
|
||||||
|
|
||||||
dev = dst->dev;
|
dev = dst->dev;
|
||||||
dev_hold(dev);
|
dev_hold(dev);
|
||||||
|
|
|
@ -195,10 +195,13 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb,
|
||||||
.saddr = src->ipv6,
|
.saddr = src->ipv6,
|
||||||
.flowi6_proto = IPPROTO_UDP
|
.flowi6_proto = IPPROTO_UDP
|
||||||
};
|
};
|
||||||
err = ipv6_stub->ipv6_dst_lookup(net, ub->ubsock->sk,
|
ndst = ipv6_stub->ipv6_dst_lookup_flow(net,
|
||||||
&ndst, &fl6);
|
ub->ubsock->sk,
|
||||||
if (err)
|
&fl6, NULL);
|
||||||
|
if (IS_ERR(ndst)) {
|
||||||
|
err = PTR_ERR(ndst);
|
||||||
goto tx_error;
|
goto tx_error;
|
||||||
|
}
|
||||||
dst_cache_set_ip6(cache, ndst, &fl6.saddr);
|
dst_cache_set_ip6(cache, ndst, &fl6.saddr);
|
||||||
}
|
}
|
||||||
ttl = ip6_dst_hoplimit(ndst);
|
ttl = ip6_dst_hoplimit(ndst);
|
||||||
|
|
Loading…
Reference in New Issue