[NETFILTER]: Fix xfrm lookup in ip_route_me_harder/ip6_route_me_harder

[mirror_ubuntu-artful-kernel.git] / net / ipv4 / ipip.c

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 078b59be91f417feb19fe11fd53c947271dc3cfb..bbd85f5ec9859ddba5fe3b986894402cde60730d 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -621,7 +621,7 @@ 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;
+       IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE|IPSKB_XFRM_TRANSFORMED);
        dst_release(skb->dst);
        skb->dst = &rt->u.dst;