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/ipip.c | |
| parent | 5ecfbae093f0c37311e89b29bfc0c9d586eace87 (diff) | |
| download | op-kernel-dev-48d5cad87c3a4998d0bda16ccfb5c60dfe4de5fb.zip op-kernel-dev-48d5cad87c3a4998d0bda16ccfb5c60dfe4de5fb.tar.gz | |
[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/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index e5cbe72..03d1374 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -622,7 +622,8 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) skb->h.raw = skb->nh.raw; skb->nh.raw = skb_push(skb, sizeof(struct iphdr)); memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); - IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE|IPSKB_XFRM_TRANSFORMED); + IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED | + IPSKB_REROUTED); dst_release(skb->dst); skb->dst = &rt->u.dst; |
