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

netns xfrm: state lookup in netns 



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

include/net/xfrm.h

+2 −2
Original line number Diff line number Diff line
@@ -1323,8 +1323,8 @@ extern int xfrm_state_check_expire(struct xfrm_state *x); 
extern void xfrm_state_insert(struct xfrm_state *x);

extern int xfrm_state_add(struct xfrm_state *x);

extern int xfrm_state_update(struct xfrm_state *x);

extern struct xfrm_state *xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family);

extern struct xfrm_state *xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family);

extern struct xfrm_state *xfrm_state_lookup(struct net *net, xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family);

extern struct xfrm_state *xfrm_state_lookup_byaddr(struct net *net, xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family);

#ifdef CONFIG_XFRM_SUB_POLICY

extern int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src,

			  int n, unsigned short family);

net/ipv4/ah4.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static void ah4_err(struct sk_buff *skb, u32 info) 
	    icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)

		return;



	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);

	x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);

	if (!x)

		return;

	printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n",

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static void esp4_err(struct sk_buff *skb, u32 info) 
	    icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)

		return;



	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET);

	x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET);

	if (!x)

		return;

	NETDEBUG(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%08x\n",

net/ipv4/ipcomp.c

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) 
		return;



	spi = htonl(ntohs(ipch->cpi));

	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr,

	x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr,

			      spi, IPPROTO_COMP, AF_INET);

	if (!x)

		return;
@@ -85,7 +85,7 @@ static int ipcomp_tunnel_attach(struct xfrm_state *x) 
	int err = 0;

	struct xfrm_state *t;



	t = xfrm_state_lookup((xfrm_address_t *)&x->id.daddr.a4,

	t = xfrm_state_lookup(&init_net, (xfrm_address_t *)&x->id.daddr.a4,

			      x->props.saddr.a4, IPPROTO_IPIP, AF_INET);

	if (!t) {

		t = ipcomp_tunnel_create(x);

net/ipv6/ah6.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	    type != ICMPV6_PKT_TOOBIG)

		return;



	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET6);

	x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET6);

	if (!x)

		return;