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

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

[IPIP]: Use proper net in (mostly) routing calls. 



There are some ip_route_output_key() calls in there that require
a proper net so give one to them.

Besides - give a proper net to a single __get_dev_by_index call 
in ipip_tunnel_bind_dev().

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

net/ipv4/ipip.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -415,7 +415,7 @@ out: 
	fl.fl4_daddr = eiph->saddr;

	fl.fl4_daddr = 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, &key)) {

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

		kfree_skb(skb2);

		kfree_skb(skb2);

		return 0;

		return 0;

	}

	}
@@ -428,7 +428,7 @@ out: 
		fl.fl4_daddr = eiph->daddr;

		fl.fl4_daddr = 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);

			kfree_skb(skb2);

			kfree_skb(skb2);
@@ -558,7 +558,7 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) 
						.saddr = tiph->saddr,

						.saddr = tiph->saddr,

						.tos = RT_TOS(tos) } },

						.tos = RT_TOS(tos) } },

				    .proto = IPPROTO_IPIP };

				    .proto = IPPROTO_IPIP };

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

		if (ip_route_output_key(dev_net(dev), &rt, &fl)) {

			tunnel->stat.tx_carrier_errors++;

			tunnel->stat.tx_carrier_errors++;

			goto tx_error_icmp;

			goto tx_error_icmp;

		}

		}
@@ -679,7 +679,7 @@ static void ipip_tunnel_bind_dev(struct net_device *dev) 
						.tos = RT_TOS(iph->tos) } },

						.tos = RT_TOS(iph->tos) } },

				    .proto = IPPROTO_IPIP };

				    .proto = IPPROTO_IPIP };

		struct rtable *rt;

		struct rtable *rt;

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

		if (!ip_route_output_key(dev_net(dev), &rt, &fl)) {

			tdev = rt->u.dst.dev;

			tdev = rt->u.dst.dev;

			ip_rt_put(rt);

			ip_rt_put(rt);

		}

		}
@@ -687,7 +687,7 @@ static void ipip_tunnel_bind_dev(struct net_device *dev) 
	}

	}





	if (!tdev && tunnel->parms.link)

	if (!tdev && tunnel->parms.link)

		tdev = __dev_get_by_index(&init_net, tunnel->parms.link);

		tdev = __dev_get_by_index(dev_net(dev), tunnel->parms.link);





	if (tdev) {

	if (tdev) {

		dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);

		dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);