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

Commit 2f7f54b7 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[IP6TUNNEL]: Use proper net instead of init_net stubs. 



All the ip_route_output_key(), dev_get_by_...() and ipv6_chk_addr()
calls are now stubbed with init_net.

Fortunately, all the places already have where to get the proper
net from.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e6c9fb5

net/ipv6/ip6_tunnel.c

+15 −11
Original line number Original line Diff line number Diff line
@@ -543,7 +543,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	fl.fl4_dst = eiph->saddr;

	fl.fl4_dst = eiph->saddr;

	fl.fl4_tos = RT_TOS(eiph->tos);

	fl.fl4_tos = RT_TOS(eiph->tos);

	fl.proto = IPPROTO_IPIP;

	fl.proto = IPPROTO_IPIP;

	if (ip_route_output_key(&init_net, &rt, &fl))

	if (ip_route_output_key(dev_net(skb->dev), &rt, &fl))

		goto out;

		goto out;





	skb2->dev = rt->u.dst.dev;

	skb2->dev = rt->u.dst.dev;
@@ -555,7 +555,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
		fl.fl4_dst = eiph->daddr;

		fl.fl4_dst = eiph->daddr;

		fl.fl4_src = eiph->saddr;

		fl.fl4_src = eiph->saddr;

		fl.fl4_tos = eiph->tos;

		fl.fl4_tos = eiph->tos;

		if (ip_route_output_key(&init_net, &rt, &fl) ||

		if (ip_route_output_key(dev_net(skb->dev), &rt, &fl) ||

		    rt->u.dst.dev->type != ARPHRD_TUNNEL) {

		    rt->u.dst.dev->type != ARPHRD_TUNNEL) {

			ip_rt_put(rt);

			ip_rt_put(rt);

			goto out;

			goto out;
@@ -612,7 +612,8 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
		skb_reset_network_header(skb2);

		skb_reset_network_header(skb2);





		/* Try to guess incoming interface */

		/* Try to guess incoming interface */

		rt = rt6_lookup(&init_net, &ipv6_hdr(skb2)->saddr, NULL, 0, 0);

		rt = rt6_lookup(dev_net(skb->dev), &ipv6_hdr(skb2)->saddr,

				NULL, 0, 0);





		if (rt && rt->rt6i_dev)

		if (rt && rt->rt6i_dev)

			skb2->dev = rt->rt6i_dev;

			skb2->dev = rt->rt6i_dev;
@@ -656,16 +657,17 @@ static inline int ip6_tnl_rcv_ctl(struct ip6_tnl *t) 
{

{

	struct ip6_tnl_parm *p = &t->parms;

	struct ip6_tnl_parm *p = &t->parms;

	int ret = 0;

	int ret = 0;

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





	if (p->flags & IP6_TNL_F_CAP_RCV) {

	if (p->flags & IP6_TNL_F_CAP_RCV) {

		struct net_device *ldev = NULL;

		struct net_device *ldev = NULL;





		if (p->link)

		if (p->link)

			ldev = dev_get_by_index(&init_net, p->link);

			ldev = dev_get_by_index(net, p->link);





		if ((ipv6_addr_is_multicast(&p->laddr) ||

		if ((ipv6_addr_is_multicast(&p->laddr) ||

		     likely(ipv6_chk_addr(&init_net, &p->laddr, ldev, 0))) &&

		     likely(ipv6_chk_addr(net, &p->laddr, ldev, 0))) &&

		    likely(!ipv6_chk_addr(&init_net, &p->raddr, NULL, 0)))

		    likely(!ipv6_chk_addr(net, &p->raddr, NULL, 0)))

			ret = 1;

			ret = 1;





		if (ldev)

		if (ldev)
@@ -793,19 +795,20 @@ static inline int ip6_tnl_xmit_ctl(struct ip6_tnl *t) 
{

{

	struct ip6_tnl_parm *p = &t->parms;

	struct ip6_tnl_parm *p = &t->parms;

	int ret = 0;

	int ret = 0;

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





	if (p->flags & IP6_TNL_F_CAP_XMIT) {

	if (p->flags & IP6_TNL_F_CAP_XMIT) {

		struct net_device *ldev = NULL;

		struct net_device *ldev = NULL;





		if (p->link)

		if (p->link)

			ldev = dev_get_by_index(&init_net, p->link);

			ldev = dev_get_by_index(net, p->link);





		if (unlikely(!ipv6_chk_addr(&init_net, &p->laddr, ldev, 0)))

		if (unlikely(!ipv6_chk_addr(net, &p->laddr, ldev, 0)))

			printk(KERN_WARNING

			printk(KERN_WARNING

			       "%s xmit: Local address not yet configured!\n",

			       "%s xmit: Local address not yet configured!\n",

			       p->name);

			       p->name);

		else if (!ipv6_addr_is_multicast(&p->raddr) &&

		else if (!ipv6_addr_is_multicast(&p->raddr) &&

			 unlikely(ipv6_chk_addr(&init_net, &p->raddr, NULL, 0)))

			 unlikely(ipv6_chk_addr(net, &p->raddr, NULL, 0)))

			printk(KERN_WARNING

			printk(KERN_WARNING

			       "%s xmit: Routing loop! "

			       "%s xmit: Routing loop! "

			       "Remote address found on this node!\n",

			       "Remote address found on this node!\n",
@@ -858,7 +861,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb, 
	if ((dst = ip6_tnl_dst_check(t)) != NULL)

	if ((dst = ip6_tnl_dst_check(t)) != NULL)

		dst_hold(dst);

		dst_hold(dst);

	else {

	else {

		dst = ip6_route_output(&init_net, NULL, fl);

		dst = ip6_route_output(dev_net(dev), NULL, fl);





		if (dst->error || xfrm_lookup(&dst, fl, NULL, 0) < 0)

		if (dst->error || xfrm_lookup(&dst, fl, NULL, 0) < 0)

			goto tx_err_link_failure;

			goto tx_err_link_failure;
@@ -1123,7 +1126,8 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) 
		int strict = (ipv6_addr_type(&p->raddr) &

		int strict = (ipv6_addr_type(&p->raddr) &

			      (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL));

			      (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL));





		struct rt6_info *rt = rt6_lookup(&init_net, &p->raddr, &p->laddr,

		struct rt6_info *rt = rt6_lookup(dev_net(dev),

						 &p->raddr, &p->laddr,

						 p->link, strict);

						 p->link, strict);





		if (rt == NULL)

		if (rt == NULL)