diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-26 02:59:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-26 02:59:27 +0100 |
| commit | 4fb236bac9fc7d51e2267866de6d4c30e549d2f8 (patch) | |
| tree | e3d024fe85be93a81553a910f556b818c8a85496 /net/ipv4/ah4.c | |
| parent | netns PF_KEY: per-netns /proc/pfkey (diff) | |
| download | linux-4fb236bac9fc7d51e2267866de6d4c30e549d2f8.tar.xz linux-4fb236bac9fc7d51e2267866de6d4c30e549d2f8.zip | |
netns xfrm: AH/ESP in netns!
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ah4.c')
| -rw-r--r-- | net/ipv4/ah4.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index 750426b0a276..e878e494296e 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c @@ -201,6 +201,7 @@ out: static void ah4_err(struct sk_buff *skb, u32 info) { + struct net *net = dev_net(skb->dev); struct iphdr *iph = (struct iphdr *)skb->data; struct ip_auth_hdr *ah = (struct ip_auth_hdr *)(skb->data+(iph->ihl<<2)); struct xfrm_state *x; @@ -209,7 +210,7 @@ static void ah4_err(struct sk_buff *skb, u32 info) icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) return; - x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET); + x = xfrm_state_lookup(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", @@ -314,6 +315,7 @@ static struct net_protocol ah4_protocol = { .handler = xfrm4_rcv, .err_handler = ah4_err, .no_policy = 1, + .netns_ok = 1, }; static int __init ah4_init(void) |