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

Commit c5b3cf46 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

netns xfrm: ->dst_lookup in netns 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db983c11

include/net/xfrm.h

+2 −1
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ struct xfrm_policy_afinfo { 
	unsigned short		family;

	struct dst_ops		*dst_ops;

	void			(*garbage_collect)(struct net *net);

	struct dst_entry	*(*dst_lookup)(int tos, xfrm_address_t *saddr,

	struct dst_entry	*(*dst_lookup)(struct net *net, int tos,

					       xfrm_address_t *saddr,

					       xfrm_address_t *daddr);

	int			(*get_saddr)(xfrm_address_t *saddr, xfrm_address_t *daddr);

	struct dst_entry	*(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy);

net/ipv4/xfrm4_policy.c

+4 −3
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
static struct dst_ops xfrm4_dst_ops;

static struct xfrm_policy_afinfo xfrm4_policy_afinfo;



static struct dst_entry *xfrm4_dst_lookup(int tos, xfrm_address_t *saddr,

static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos,

					  xfrm_address_t *saddr,

					  xfrm_address_t *daddr)

{

	struct flowi fl = {
@@ -36,7 +37,7 @@ static struct dst_entry *xfrm4_dst_lookup(int tos, xfrm_address_t *saddr, 
	if (saddr)

		fl.fl4_src = saddr->a4;



	err = __ip_route_output_key(&init_net, &rt, &fl);

	err = __ip_route_output_key(net, &rt, &fl);

	dst = &rt->u.dst;

	if (err)

		dst = ERR_PTR(err);
@@ -48,7 +49,7 @@ static int xfrm4_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr) 
	struct dst_entry *dst;

	struct rtable *rt;



	dst = xfrm4_dst_lookup(0, NULL, daddr);

	dst = xfrm4_dst_lookup(&init_net, 0, NULL, daddr);

	if (IS_ERR(dst))

		return -EHOSTUNREACH;

net/ipv6/xfrm6_policy.c

+4 −3
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
static struct dst_ops xfrm6_dst_ops;

static struct xfrm_policy_afinfo xfrm6_policy_afinfo;



static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,

static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos,

					  xfrm_address_t *saddr,

					  xfrm_address_t *daddr)

{

	struct flowi fl = {};
@@ -38,7 +39,7 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr, 
	if (saddr)

		memcpy(&fl.fl6_src, saddr, sizeof(fl.fl6_src));



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

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



	err = dst->error;

	if (dst->error) {
@@ -54,7 +55,7 @@ static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr) 
	struct dst_entry *dst;

	struct net_device *dev;



	dst = xfrm6_dst_lookup(0, NULL, daddr);

	dst = xfrm6_dst_lookup(&init_net, 0, NULL, daddr);

	if (IS_ERR(dst))

		return -EHOSTUNREACH;

net/xfrm/xfrm_policy.c

+4 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl, 
	return 0;

}



static inline struct dst_entry *__xfrm_dst_lookup(int tos,

static inline struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos,

						  xfrm_address_t *saddr,

						  xfrm_address_t *daddr,

						  int family)
@@ -104,7 +104,7 @@ static inline struct dst_entry *__xfrm_dst_lookup(int tos, 
	if (unlikely(afinfo == NULL))

		return ERR_PTR(-EAFNOSUPPORT);



	dst = afinfo->dst_lookup(tos, saddr, daddr);

	dst = afinfo->dst_lookup(net, tos, saddr, daddr);



	xfrm_policy_put_afinfo(afinfo);
@@ -116,6 +116,7 @@ static inline struct dst_entry *xfrm_dst_lookup(struct xfrm_state *x, int tos, 
						xfrm_address_t *prev_daddr,

						int family)

{

	struct net *net = xs_net(x);

	xfrm_address_t *saddr = &x->props.saddr;

	xfrm_address_t *daddr = &x->id.daddr;

	struct dst_entry *dst;
@@ -129,7 +130,7 @@ static inline struct dst_entry *xfrm_dst_lookup(struct xfrm_state *x, int tos, 
		daddr = x->coaddr;

	}



	dst = __xfrm_dst_lookup(tos, saddr, daddr, family);

	dst = __xfrm_dst_lookup(net, tos, saddr, daddr, family);



	if (!IS_ERR(dst)) {

		if (prev_saddr != saddr)