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

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

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: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cdcbca7c

include/net/dst.h

+8 −8
Original line number Diff line number Diff line
@@ -291,21 +291,21 @@ enum { 


struct flowi;

#ifndef CONFIG_XFRM

static inline int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,

		       struct sock *sk, int flags)

static inline int xfrm_lookup(struct net *net, struct dst_entry **dst_p,

			      struct flowi *fl, struct sock *sk, int flags)

{

	return 0;

} 

static inline int __xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,

				struct sock *sk, int flags)

static inline int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,

				struct flowi *fl, struct sock *sk, int flags)

{

	return 0;

}

#else

extern int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,

		       struct sock *sk, int flags);

extern int __xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,

			 struct sock *sk, int flags);

extern int xfrm_lookup(struct net *net, struct dst_entry **dst_p,

		       struct flowi *fl, struct sock *sk, int flags);

extern int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,

			 struct flowi *fl, struct sock *sk, int flags);

#endif

#endif

include/net/flow.h

+5 −4
Original line number Diff line number Diff line
@@ -84,12 +84,13 @@ struct flowi { 
#define FLOW_DIR_OUT	1

#define FLOW_DIR_FWD	2



struct net;

struct sock;

typedef int (*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,

			       void **objp, atomic_t **obj_refp);

typedef int (*flow_resolve_t)(struct net *net, struct flowi *key, u16 family,

			      u8 dir, void **objp, atomic_t **obj_refp);



extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,

	 		       flow_resolve_t resolver);

extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,

			       u8 dir, flow_resolve_t resolver);

extern void flow_cache_flush(void);

extern atomic_t flow_cache_genid;

net/core/flow.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int flow_key_compare(struct flowi *key1, struct flowi *key2) 
	return 0;

}



void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,

void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,

			flow_resolve_t resolver)

{

	struct flow_cache_entry *fle, **head;
@@ -225,7 +225,7 @@ nocache: 
		void *obj;

		atomic_t *obj_ref;



		err = resolver(key, family, dir, &obj, &obj_ref);

		err = resolver(net, key, family, dir, &obj, &obj_ref);



		if (fle && !err) {

			fle->genid = atomic_read(&flow_cache_genid);

net/dccp/ipv6.c

+5 −5
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
				goto out;

			}



			err = xfrm_lookup(&dst, &fl, sk, 0);

			err = xfrm_lookup(net, &dst, &fl, sk, 0);

			if (err < 0) {

				sk->sk_err_soft = -err;

				goto out;
@@ -279,7 +279,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req) 
	if (final_p)

		ipv6_addr_copy(&fl.fl6_dst, final_p);



	err = xfrm_lookup(&dst, &fl, sk, 0);

	err = xfrm_lookup(sock_net(sk), &dst, &fl, sk, 0);

	if (err < 0)

		goto done;
@@ -343,7 +343,7 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) 


	/* sk = NULL, but it is safe for now. RST socket required. */

	if (!ip6_dst_lookup(ctl_sk, &skb->dst, &fl)) {

		if (xfrm_lookup(&skb->dst, &fl, NULL, 0) >= 0) {

		if (xfrm_lookup(net, &skb->dst, &fl, NULL, 0) >= 0) {

			ip6_xmit(ctl_sk, skb, &fl, NULL, 0);

			DCCP_INC_STATS_BH(DCCP_MIB_OUTSEGS);

			DCCP_INC_STATS_BH(DCCP_MIB_OUTRSTS);
@@ -569,7 +569,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
		if (final_p)

			ipv6_addr_copy(&fl.fl6_dst, final_p);



		if ((xfrm_lookup(&dst, &fl, sk, 0)) < 0)

		if ((xfrm_lookup(sock_net(sk), &dst, &fl, sk, 0)) < 0)

			goto out;

	}
@@ -1004,7 +1004,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
	if (final_p)

		ipv6_addr_copy(&fl.fl6_dst, final_p);



	err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT);

	err = __xfrm_lookup(sock_net(sk), &dst, &fl, sk, XFRM_LOOKUP_WAIT);

	if (err < 0) {

		if (err == -EREMOTE)

			err = ip6_dst_blackhole(sk, &dst, &fl);

net/decnet/dn_route.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}