netns xfrm: lookup in netns
Pass netns to xfrm_lookup()/__xfrm_lookup(). For that pass netns to flow_cache_lookup() and resolver callback. Take it from socket or netdevice. Stub DECnet to init_net. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
cdcbca7c1f
commit
52479b623d
@@ -1184,7 +1184,7 @@ static int dn_route_output_key(struct dst_entry **pprt, struct flowi *flp, int f
|
||||
|
||||
err = __dn_route_output_key(pprt, flp, flags);
|
||||
if (err == 0 && flp->proto) {
|
||||
err = xfrm_lookup(pprt, flp, NULL, 0);
|
||||
err = xfrm_lookup(&init_net, pprt, flp, NULL, 0);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
@@ -1195,8 +1195,8 @@ int dn_route_output_sock(struct dst_entry **pprt, struct flowi *fl, struct sock
|
||||
|
||||
err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD);
|
||||
if (err == 0 && fl->proto) {
|
||||
err = xfrm_lookup(pprt, fl, sk, (flags & MSG_DONTWAIT) ?
|
||||
0 : XFRM_LOOKUP_WAIT);
|
||||
err = xfrm_lookup(&init_net, pprt, fl, sk,
|
||||
(flags & MSG_DONTWAIT) ? 0 : XFRM_LOOKUP_WAIT);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
Reference in New Issue
Block a user