diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-02-15 15:10:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-02-15 15:10:22 -0800 |
| commit | 48d5cad87c3a4998d0bda16ccfb5c60dfe4de5fb (patch) | |
| tree | bfad91af72f4c522a44bab6133b540cda365d8c1 /net/ipv4/xfrm4_output.c | |
| parent | 5ecfbae093f0c37311e89b29bfc0c9d586eace87 (diff) | |
| download | linux-stable-48d5cad87c3a4998d0bda16ccfb5c60dfe4de5fb.tar.gz linux-stable-48d5cad87c3a4998d0bda16ccfb5c60dfe4de5fb.tar.bz2 linux-stable-48d5cad87c3a4998d0bda16ccfb5c60dfe4de5fb.zip | |
[XFRM]: Fix SNAT-related crash in xfrm4_output_finish
When a packet matching an IPsec policy is SNATed so it doesn't match any
policy anymore it looses its xfrm bundle, which makes xfrm4_output_finish
crash because of a NULL pointer dereference.
This patch directs these packets to the original output path instead. Since
the packets have already passed the POST_ROUTING hook, but need to start at
the beginning of the original output path which includes another
POST_ROUTING invocation, a flag is added to the IPCB to indicate that the
packet was rerouted and doesn't need to pass the POST_ROUTING hook again.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
| -rw-r--r-- | net/ipv4/xfrm4_output.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c index d4df0ddd424b..32ad229b4fed 100644 --- a/net/ipv4/xfrm4_output.c +++ b/net/ipv4/xfrm4_output.c @@ -152,10 +152,16 @@ error_nolock: goto out_exit; } -int xfrm4_output_finish(struct sk_buff *skb) +static int xfrm4_output_finish(struct sk_buff *skb) { int err; +#ifdef CONFIG_NETFILTER + if (!skb->dst->xfrm) { + IPCB(skb)->flags |= IPSKB_REROUTED; + return dst_output(skb); + } +#endif while (likely((err = xfrm4_output_one(skb)) == 0)) { nf_reset(skb); @@ -178,6 +184,7 @@ int xfrm4_output_finish(struct sk_buff *skb) int xfrm4_output(struct sk_buff *skb) { - return NF_HOOK(PF_INET, NF_IP_POST_ROUTING, skb, NULL, skb->dst->dev, - xfrm4_output_finish); + return NF_HOOK_COND(PF_INET, NF_IP_POST_ROUTING, skb, NULL, skb->dst->dev, + xfrm4_output_finish, + !(IPCB(skb)->flags & IPSKB_REROUTED)); } |