Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65a2022e authored by David Ahern's avatar David Ahern Committed by Daniel Borkmann
Browse files

net/ipv6: Add fib lookup stubs for use in bpf helper 



Add stubs to retrieve a handle to an IPv6 FIB table, fib6_get_table,
a stub to do a lookup in a specific table, fib6_table_lookup, and
a stub for a full route lookup.

The stubs are needed for core bpf code to handle the case when the
IPv6 module is not builtin.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent d4bea421

include/net/addrconf.h

+14 −0
Original line number Diff line number Diff line
@@ -223,6 +223,20 @@ struct ipv6_stub { 
				 const struct in6_addr *addr);

	int (*ipv6_dst_lookup)(struct net *net, struct sock *sk,

			       struct dst_entry **dst, struct flowi6 *fl6);



	struct fib6_table *(*fib6_get_table)(struct net *net, u32 id);

	struct fib6_info *(*fib6_lookup)(struct net *net, int oif,

					 struct flowi6 *fl6, int flags);

	struct fib6_info *(*fib6_table_lookup)(struct net *net,

					      struct fib6_table *table,

					      int oif, struct flowi6 *fl6,

					      int flags);

	struct fib6_info *(*fib6_multipath_select)(const struct net *net,

						   struct fib6_info *f6i,

						   struct flowi6 *fl6, int oif,

						   const struct sk_buff *skb,

						   int strict);



	void (*udpv6_encap_enable)(void);

	void (*ndisc_send_na)(struct net_device *dev, const struct in6_addr *daddr,

			      const struct in6_addr *solicited_addr,

net/ipv6/addrconf_core.c

+32 −1
Original line number Diff line number Diff line
@@ -134,8 +134,39 @@ static int eafnosupport_ipv6_dst_lookup(struct net *net, struct sock *u1, 
	return -EAFNOSUPPORT;

}



static struct fib6_table *eafnosupport_fib6_get_table(struct net *net, u32 id)

{

	return NULL;

}



static struct fib6_info *

eafnosupport_fib6_table_lookup(struct net *net, struct fib6_table *table,

			       int oif, struct flowi6 *fl6, int flags)

{

	return NULL;

}



static struct fib6_info *

eafnosupport_fib6_lookup(struct net *net, int oif, struct flowi6 *fl6,

			 int flags)

{

	return NULL;

}



static struct fib6_info *

eafnosupport_fib6_multipath_select(const struct net *net, struct fib6_info *f6i,

				   struct flowi6 *fl6, int oif,

				   const struct sk_buff *skb, int strict)

{

	return f6i;

}



const struct ipv6_stub *ipv6_stub __read_mostly = &(struct ipv6_stub) {

	.ipv6_dst_lookup   = eafnosupport_ipv6_dst_lookup,

	.fib6_get_table    = eafnosupport_fib6_get_table,

	.fib6_table_lookup = eafnosupport_fib6_table_lookup,

	.fib6_lookup       = eafnosupport_fib6_lookup,

	.fib6_multipath_select = eafnosupport_fib6_multipath_select,

};

EXPORT_SYMBOL_GPL(ipv6_stub);

net/ipv6/af_inet6.c

+5 −1
Original line number Diff line number Diff line
@@ -890,6 +890,10 @@ static const struct ipv6_stub ipv6_stub_impl = { 
	.ipv6_sock_mc_join = ipv6_sock_mc_join,

	.ipv6_sock_mc_drop = ipv6_sock_mc_drop,

	.ipv6_dst_lookup   = ip6_dst_lookup,

	.fib6_get_table	   = fib6_get_table,

	.fib6_table_lookup = fib6_table_lookup,

	.fib6_lookup       = fib6_lookup,

	.fib6_multipath_select = fib6_multipath_select,

	.udpv6_encap_enable = udpv6_encap_enable,

	.ndisc_send_na = ndisc_send_na,

	.nd_tbl	= &nd_tbl,