AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-13 11:17:31 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[GRE]: Use proper net in routing calls.

Browse Source 
As for the IPIP tunnel, there are some ip_route_output_key()
calls in there that require a proper net so give one to them.

And a proper net for the __get_dev_by_index hanging around.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2008-04-16 01:10:44 -07:00 committed by David S. Miller
parent eb8ce741a3
commit 96635522f7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ipv4/ip_gre.c
View File

@ -493,7 +493,7 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
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_GRE; fl.proto = IPPROTO_GRE;
if (ip_route_output_key(&init_net, &rt, &fl)) { if (ip_route_output_key(dev_net(skb->dev), &rt, &fl)) {
kfree_skb(skb2); kfree_skb(skb2);
return; return;
} }
@ -506,7 +506,7 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
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_IPGRE) { rt->u.dst.dev->type != ARPHRD_IPGRE) {
ip_rt_put(rt); ip_rt_put(rt);
kfree_skb(skb2); kfree_skb(skb2);
@ -762,7 +762,7 @@ static int ipgre_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_GRE }; .proto = IPPROTO_GRE };
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; goto tx_error;
} }
@ -935,7 +935,7 @@ static void ipgre_tunnel_bind_dev(struct net_device *dev)
.tos = RT_TOS(iph->tos) } }, .tos = RT_TOS(iph->tos) } },
.proto = IPPROTO_GRE }; .proto = IPPROTO_GRE };
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);
} }
@ -943,7 +943,7 @@ static void ipgre_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) {
hlen = tdev->hard_header_len; hlen = tdev->hard_header_len;
@ -1193,7 +1193,7 @@ static int ipgre_open(struct net_device *dev)
.tos = RT_TOS(t->parms.iph.tos) } }, .tos = RT_TOS(t->parms.iph.tos) } },
.proto = IPPROTO_GRE }; .proto = IPPROTO_GRE };
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))
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
dev = rt->u.dst.dev; dev = rt->u.dst.dev;
ip_rt_put(rt); ip_rt_put(rt);