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

Commit afb1d4b5 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net/ipv6: Pass net namespace to route functions 



Pass network namespace reference into route add, delete and get
functions.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7aef6859

include/net/ip6_route.h

+7 −5
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ void ip6_route_cleanup(void); 
int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg);



int ip6_route_add(struct fib6_config *cfg, struct netlink_ext_ack *extack);

int ip6_ins_rt(struct rt6_info *);

int ip6_del_rt(struct rt6_info *);

int ip6_ins_rt(struct net *net, struct rt6_info *rt);

int ip6_del_rt(struct net *net, struct rt6_info *rt);



void rt6_flush_exceptions(struct rt6_info *rt);

int rt6_remove_exception_rt(struct rt6_info *rt);
@@ -137,7 +137,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, struct flowi6 *fl6); 


void fib6_force_start_gc(struct net *net);



struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,

struct rt6_info *addrconf_dst_alloc(struct net *net, struct inet6_dev *idev,

				    const struct in6_addr *addr, bool anycast);



struct rt6_info *ip6_dst_alloc(struct net *net, struct net_device *dev,
@@ -147,9 +147,11 @@ struct rt6_info *ip6_dst_alloc(struct net *net, struct net_device *dev, 
 *	support functions for ND

 *

 */

struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr,

struct rt6_info *rt6_get_dflt_router(struct net *net,

				     const struct in6_addr *addr,

				     struct net_device *dev);

struct rt6_info *rt6_add_dflt_router(const struct in6_addr *gwaddr,

struct rt6_info *rt6_add_dflt_router(struct net *net,

				     const struct in6_addr *gwaddr,

				     struct net_device *dev, unsigned int pref);



void rt6_purge_dflt_routers(struct net *net);

net/ipv6/addrconf.c

+18 −15
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, 
		goto out;

	}



	rt = addrconf_dst_alloc(idev, addr, false);

	rt = addrconf_dst_alloc(net, idev, addr, false);

	if (IS_ERR(rt)) {

		err = PTR_ERR(rt);

		rt = NULL;
@@ -1187,7 +1187,7 @@ cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long expires, bool del_r 
				       0, RTF_GATEWAY | RTF_DEFAULT);

	if (rt) {

		if (del_rt)

			ip6_del_rt(rt);

			ip6_del_rt(dev_net(ifp->idev->dev), rt);

		else {

			if (!(rt->rt6i_flags & RTF_EXPIRES))

				rt6_set_expires(rt, expires);
@@ -2666,7 +2666,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) 
		if (rt) {

			/* Autoconf prefix route */

			if (valid_lft == 0) {

				ip6_del_rt(rt);

				ip6_del_rt(net, rt);

				rt = NULL;

			} else if (addrconf_finite_timeout(rt_expires)) {

				/* not infinity */
@@ -3333,7 +3333,8 @@ static void addrconf_gre_config(struct net_device *dev) 
}

#endif



static int fixup_permanent_addr(struct inet6_dev *idev,

static int fixup_permanent_addr(struct net *net,

				struct inet6_dev *idev,

				struct inet6_ifaddr *ifp)

{

	/* !rt6i_node means the host route was removed from the
@@ -3343,7 +3344,7 @@ static int fixup_permanent_addr(struct inet6_dev *idev, 
	if (!ifp->rt || !ifp->rt->rt6i_node) {

		struct rt6_info *rt, *prev;



		rt = addrconf_dst_alloc(idev, &ifp->addr, false);

		rt = addrconf_dst_alloc(net, idev, &ifp->addr, false);

		if (IS_ERR(rt))

			return PTR_ERR(rt);
@@ -3367,7 +3368,7 @@ static int fixup_permanent_addr(struct inet6_dev *idev, 
	return 0;

}



static void addrconf_permanent_addr(struct net_device *dev)

static void addrconf_permanent_addr(struct net *net, struct net_device *dev)

{

	struct inet6_ifaddr *ifp, *tmp;

	struct inet6_dev *idev;
@@ -3380,7 +3381,7 @@ static void addrconf_permanent_addr(struct net_device *dev) 


	list_for_each_entry_safe(ifp, tmp, &idev->addr_list, if_list) {

		if ((ifp->flags & IFA_F_PERMANENT) &&

		    fixup_permanent_addr(idev, ifp) < 0) {

		    fixup_permanent_addr(net, idev, ifp) < 0) {

			write_unlock_bh(&idev->lock);

			in6_ifa_hold(ifp);

			ipv6_del_addr(ifp);
@@ -3449,7 +3450,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, 


		if (event == NETDEV_UP) {

			/* restore routes for permanent addresses */

			addrconf_permanent_addr(dev);

			addrconf_permanent_addr(net, dev);



			if (!addrconf_link_ready(dev)) {

				/* device is not ready yet. */
@@ -3735,7 +3736,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) 
		spin_unlock_bh(&ifa->lock);



		if (rt)

			ip6_del_rt(rt);

			ip6_del_rt(net, rt);



		if (state != INET6_IFADDR_STATE_DEAD) {

			__ipv6_ifa_notify(RTM_DELADDR, ifa);
@@ -3853,6 +3854,7 @@ static void addrconf_dad_begin(struct inet6_ifaddr *ifp) 
	struct inet6_dev *idev = ifp->idev;

	struct net_device *dev = idev->dev;

	bool bump_id, notify = false;

	struct net *net;



	addrconf_join_solict(dev, &ifp->addr);
@@ -3863,8 +3865,9 @@ static void addrconf_dad_begin(struct inet6_ifaddr *ifp) 
	if (ifp->state == INET6_IFADDR_STATE_DEAD)

		goto out;



	net = dev_net(dev);

	if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||

	    (dev_net(dev)->ipv6.devconf_all->accept_dad < 1 &&

	    (net->ipv6.devconf_all->accept_dad < 1 &&

	     idev->cnf.accept_dad < 1) ||

	    !(ifp->flags&IFA_F_TENTATIVE) ||

	    ifp->flags & IFA_F_NODAD) {
@@ -3900,8 +3903,8 @@ static void addrconf_dad_begin(struct inet6_ifaddr *ifp) 
	 * Frames right away

	 */

	if (ifp->flags & IFA_F_OPTIMISTIC) {

		ip6_ins_rt(ifp->rt);

		if (ipv6_use_optimistic_addr(dev_net(dev), idev)) {

		ip6_ins_rt(net, ifp->rt);

		if (ipv6_use_optimistic_addr(net, idev)) {

			/* Because optimistic nodes can use this address,

			 * notify listeners. If DAD fails, RTM_DELADDR is sent.

			 */
@@ -5604,7 +5607,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) 
		 * to do it again

		 */

		if (!rcu_access_pointer(ifp->rt->rt6i_node))

			ip6_ins_rt(ifp->rt);

			ip6_ins_rt(net, ifp->rt);

		if (ifp->idev->cnf.forwarding)

			addrconf_join_anycast(ifp);

		if (!ipv6_addr_any(&ifp->peer_addr))
@@ -5621,11 +5624,11 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) 
			rt = addrconf_get_prefix_route(&ifp->peer_addr, 128,

						       ifp->idev->dev, 0, 0);

			if (rt)

				ip6_del_rt(rt);

				ip6_del_rt(net, rt);

		}

		if (ifp->rt) {

			if (dst_hold_safe(&ifp->rt->dst))

				ip6_del_rt(ifp->rt);

				ip6_del_rt(net, ifp->rt);

		}

		rt_genid_bump_ipv6(net);

		break;

net/ipv6/anycast.c

+6 −4
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr) 
{

	struct ifacaddr6 *aca;

	struct rt6_info *rt;

	struct net *net;

	int err;



	ASSERT_RTNL();
@@ -265,7 +266,8 @@ int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr) 
		}

	}



	rt = addrconf_dst_alloc(idev, addr, true);

	net = dev_net(idev->dev);

	rt = addrconf_dst_alloc(net, idev, addr, true);

	if (IS_ERR(rt)) {

		err = PTR_ERR(rt);

		goto out;
@@ -286,7 +288,7 @@ int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr) 
	aca_get(aca);

	write_unlock_bh(&idev->lock);



	ip6_ins_rt(rt);

	ip6_ins_rt(net, rt);



	addrconf_join_solict(idev->dev, &aca->aca_addr);
@@ -329,7 +331,7 @@ int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr) 
	addrconf_leave_solict(idev, &aca->aca_addr);



	dst_hold(&aca->aca_rt->dst);

	ip6_del_rt(aca->aca_rt);

	ip6_del_rt(dev_net(idev->dev), aca->aca_rt);



	aca_put(aca);

	return 0;
@@ -357,7 +359,7 @@ void ipv6_ac_destroy_dev(struct inet6_dev *idev) 
		addrconf_leave_solict(idev, &aca->aca_addr);



		dst_hold(&aca->aca_rt->dst);

		ip6_del_rt(aca->aca_rt);

		ip6_del_rt(dev_net(idev->dev), aca->aca_rt);



		aca_put(aca);

net/ipv6/ndisc.c

+7 −5
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) 
	struct neighbour *neigh = NULL;

	struct inet6_dev *in6_dev;

	struct rt6_info *rt = NULL;

	struct net *net;

	int lifetime;

	struct ndisc_options ndopts;

	int optlen;
@@ -1253,9 +1254,9 @@ static void ndisc_router_discovery(struct sk_buff *skb) 
	/* Do not accept RA with source-addr found on local machine unless

	 * accept_ra_from_local is set to true.

	 */

	net = dev_net(in6_dev->dev);

	if (!in6_dev->cnf.accept_ra_from_local &&

	    ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,

			  in6_dev->dev, 0)) {

	    ipv6_chk_addr(net, &ipv6_hdr(skb)->saddr, in6_dev->dev, 0)) {

		ND_PRINTK(2, info,

			  "RA from local address detected on dev: %s: default router ignored\n",

			  skb->dev->name);
@@ -1272,7 +1273,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) 
		pref = ICMPV6_ROUTER_PREF_MEDIUM;

#endif



	rt = rt6_get_dflt_router(&ipv6_hdr(skb)->saddr, skb->dev);

	rt = rt6_get_dflt_router(net, &ipv6_hdr(skb)->saddr, skb->dev);



	if (rt) {

		neigh = dst_neigh_lookup(&rt->dst, &ipv6_hdr(skb)->saddr);
@@ -1285,7 +1286,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) 
		}

	}

	if (rt && lifetime == 0) {

		ip6_del_rt(rt);

		ip6_del_rt(net, rt);

		rt = NULL;

	}
@@ -1294,7 +1295,8 @@ static void ndisc_router_discovery(struct sk_buff *skb) 
	if (!rt && lifetime) {

		ND_PRINTK(3, info, "RA: adding default router\n");



		rt = rt6_add_dflt_router(&ipv6_hdr(skb)->saddr, skb->dev, pref);

		rt = rt6_add_dflt_router(net, &ipv6_hdr(skb)->saddr,

					 skb->dev, pref);

		if (!rt) {

			ND_PRINTK(0, err,

				  "RA: %s failed to add default route\n",

net/ipv6/route.c

+28 −26
Original line number Diff line number Diff line
@@ -850,13 +850,13 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, 
	}



	if (rinfo->prefix_len == 0)

		rt = rt6_get_dflt_router(gwaddr, dev);

		rt = rt6_get_dflt_router(net, gwaddr, dev);

	else

		rt = rt6_get_route_info(net, prefix, rinfo->prefix_len,

					gwaddr, dev);



	if (rt && !lifetime) {

		ip6_del_rt(rt);

		ip6_del_rt(net, rt);

		rt = NULL;

	}
@@ -1014,9 +1014,9 @@ static int __ip6_ins_rt(struct rt6_info *rt, struct nl_info *info, 
	return err;

}



int ip6_ins_rt(struct rt6_info *rt)

int ip6_ins_rt(struct net *net, struct rt6_info *rt)

{

	struct nl_info info = {	.nl_net = dev_net(rt->dst.dev), };

	struct nl_info info = {	.nl_net = net, };

	struct mx6_config mxc = { .mx = NULL, };



	/* Hold dst to account for the reference from the fib6 tree */
@@ -1121,14 +1121,13 @@ static struct rt6_info *rt6_get_pcpu_route(struct rt6_info *rt) 
	return pcpu_rt;

}



static struct rt6_info *rt6_make_pcpu_route(struct rt6_info *rt)

static struct rt6_info *rt6_make_pcpu_route(struct net *net,

					    struct rt6_info *rt)

{

	struct rt6_info *pcpu_rt, *prev, **p;



	pcpu_rt = ip6_rt_pcpu_alloc(rt);

	if (!pcpu_rt) {

		struct net *net = dev_net(rt->dst.dev);



		dst_hold(&net->ipv6.ip6_null_entry->dst);

		return net->ipv6.ip6_null_entry;

	}
@@ -1787,7 +1786,7 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, 
				/* No dst_hold() on rt is needed because grabbing

				 * rt->rt6i_ref makes sure rt can't be released.

				 */

				pcpu_rt = rt6_make_pcpu_route(rt);

				pcpu_rt = rt6_make_pcpu_route(net, rt);

				rt6_release(rt);

			} else {

				/* rt is already removed from tree */
@@ -2088,7 +2087,7 @@ static struct dst_entry *ip6_negative_advice(struct dst_entry *dst) 
	if (rt) {

		if (rt->rt6i_flags & RTF_CACHE) {

			if (rt6_check_expired(rt)) {

				ip6_del_rt(rt);

				ip6_del_rt(dev_net(dst->dev), rt);

				dst = NULL;

			}

		} else {
@@ -2109,7 +2108,7 @@ static void ip6_link_failure(struct sk_buff *skb) 
	if (rt) {

		if (rt->rt6i_flags & RTF_CACHE) {

			if (dst_hold_safe(&rt->dst))

				ip6_del_rt(rt);

				ip6_del_rt(dev_net(rt->dst.dev), rt);

		} else {

			struct fib6_node *fn;
@@ -3018,9 +3017,9 @@ int ip6_route_add(struct fib6_config *cfg, 


static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info)

{

	int err;

	struct net *net = info->nl_net;

	struct fib6_table *table;

	struct net *net = dev_net(rt->dst.dev);

	int err;



	if (rt == net->ipv6.ip6_null_entry) {

		err = -ENOENT;
@@ -3037,11 +3036,10 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info) 
	return err;

}



int ip6_del_rt(struct rt6_info *rt)

int ip6_del_rt(struct net *net, struct rt6_info *rt)

{

	struct nl_info info = {

		.nl_net = dev_net(rt->dst.dev),

	};

	struct nl_info info = { .nl_net = net };



	return __ip6_del_rt(rt, &info);

}
@@ -3376,13 +3374,15 @@ static struct rt6_info *rt6_add_route_info(struct net *net, 
}

#endif



struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr, struct net_device *dev)

struct rt6_info *rt6_get_dflt_router(struct net *net,

				     const struct in6_addr *addr,

				     struct net_device *dev)

{

	u32 tb_id = l3mdev_fib_table(dev) ? : RT6_TABLE_DFLT;

	struct rt6_info *rt;

	struct fib6_table *table;



	table = fib6_get_table(dev_net(dev), tb_id);

	table = fib6_get_table(net, tb_id);

	if (!table)

		return NULL;
@@ -3399,7 +3399,8 @@ struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr, struct net_dev 
	return rt;

}



struct rt6_info *rt6_add_dflt_router(const struct in6_addr *gwaddr,

struct rt6_info *rt6_add_dflt_router(struct net *net,

				     const struct in6_addr *gwaddr,

				     struct net_device *dev,

				     unsigned int pref)

{
@@ -3412,7 +3413,7 @@ struct rt6_info *rt6_add_dflt_router(const struct in6_addr *gwaddr, 
		.fc_protocol = RTPROT_RA,

		.fc_nlinfo.portid = 0,

		.fc_nlinfo.nlh = NULL,

		.fc_nlinfo.nl_net = dev_net(dev),

		.fc_nlinfo.nl_net = net,

	};



	cfg.fc_gateway = *gwaddr;
@@ -3425,10 +3426,11 @@ struct rt6_info *rt6_add_dflt_router(const struct in6_addr *gwaddr, 
			table->flags |= RT6_TABLE_HAS_DFLT_ROUTER;

	}



	return rt6_get_dflt_router(gwaddr, dev);

	return rt6_get_dflt_router(net, gwaddr, dev);

}



static void __rt6_purge_dflt_routers(struct fib6_table *table)

static void __rt6_purge_dflt_routers(struct net *net,

				     struct fib6_table *table)

{

	struct rt6_info *rt;
@@ -3439,7 +3441,7 @@ static void __rt6_purge_dflt_routers(struct fib6_table *table) 
		    (!rt->rt6i_idev || rt->rt6i_idev->cnf.accept_ra != 2)) {

			if (dst_hold_safe(&rt->dst)) {

				rcu_read_unlock();

				ip6_del_rt(rt);

				ip6_del_rt(net, rt);

			} else {

				rcu_read_unlock();

			}
@@ -3463,7 +3465,7 @@ void rt6_purge_dflt_routers(struct net *net) 
		head = &net->ipv6.fib_table_hash[h];

		hlist_for_each_entry_rcu(table, head, tb6_hlist) {

			if (table->flags & RT6_TABLE_HAS_DFLT_ROUTER)

				__rt6_purge_dflt_routers(table);

				__rt6_purge_dflt_routers(net, table);

		}

	}
@@ -3583,12 +3585,12 @@ static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff 
 *	Allocate a dst for local (unicast / anycast) address.

 */



struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,

struct rt6_info *addrconf_dst_alloc(struct net *net,

				    struct inet6_dev *idev,

				    const struct in6_addr *addr,

				    bool anycast)

{

	u32 tb_id;

	struct net *net = dev_net(idev->dev);

	struct net_device *dev = idev->dev;

	struct rt6_info *rt;