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

Commit 7462bd74 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[NETNS]: Add a namespace mark to fib_info. 



This is required to make fib_info lookups namespace aware. In the
other case initial namespace devices are marked as dead in the local
routing table during other namespace stop.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85326fa5

include/net/ip_fib.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct fib_nh { 
struct fib_info {

	struct hlist_node	fib_hash;

	struct hlist_node	fib_lhash;

	struct net		*fib_net;

	int			fib_treeref;

	atomic_t		fib_clntref;

	int			fib_dead;

net/ipv4/fib_semantics.c

+4 −4
Original line number Diff line number Diff line
@@ -687,6 +687,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg) 
	struct fib_info *fi = NULL;

	struct fib_info *ofi;

	int nhs = 1;

	struct net *net = cfg->fc_nlinfo.nl_net;



	/* Fast check to catch the most weird cases */

	if (fib_props[cfg->fc_type].scope > cfg->fc_scope)
@@ -727,6 +728,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg) 
		goto failure;

	fib_info_cnt++;



	fi->fib_net = net;

	fi->fib_protocol = cfg->fc_protocol;

	fi->fib_flags = cfg->fc_flags;

	fi->fib_priority = cfg->fc_priority;
@@ -798,8 +800,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg) 
		if (nhs != 1 || nh->nh_gw)

			goto err_inval;

		nh->nh_scope = RT_SCOPE_NOWHERE;

		nh->nh_dev = dev_get_by_index(cfg->fc_nlinfo.nl_net,

					      fi->fib_nh->nh_oif);

		nh->nh_dev = dev_get_by_index(net, fi->fib_nh->nh_oif);

		err = -ENODEV;

		if (nh->nh_dev == NULL)

			goto failure;
@@ -813,8 +814,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg) 
	if (fi->fib_prefsrc) {

		if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst ||

		    fi->fib_prefsrc != cfg->fc_dst)

			if (inet_addr_type(cfg->fc_nlinfo.nl_net,

					   fi->fib_prefsrc) != RTN_LOCAL)

			if (inet_addr_type(net, fi->fib_prefsrc) != RTN_LOCAL)

				goto err_inval;

	}