[IPIP]: Decapsulate after checking policy.

23c50109 · Herbert Xu · Stephen Hemminger · 6ab5c9ad · 23c50109
Commit 23c50109 authored Oct 12, 2003 by Herbert Xu Committed by Stephen Hemminger Oct 12, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

net/ipv4/ipip.c net/ipv4/ipip.c +6 -5

No files found.
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -475,11 +475,6 @@ static int ipip_rcv(struct sk_buff *skb)
 		goto out;

 	iph = skb->nh.iph;
-	skb->mac.raw = skb->nh.raw;
-	skb->nh.raw = skb->data;
-	memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
-	skb->protocol = htons(ETH_P_IP);
-	skb->pkt_type = PACKET_HOST;

 	read_lock(&ipip_lock);
 	if ((tunnel = ipip_tunnel_lookup(iph->saddr, iph->daddr)) != NULL) {
@@ -488,6 +483,12 @@ static int ipip_rcv(struct sk_buff *skb)
 			return 0;
 		}

+		skb->mac.raw = skb->nh.raw;
+		skb->nh.raw = skb->data;
+		memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
+		skb->protocol = htons(ETH_P_IP);
+		skb->pkt_type = PACKET_HOST;
+
 		tunnel->stat.rx_packets++;
 		tunnel->stat.rx_bytes += skb->len;
 		skb->dev = tunnel->dev;