gre: Fix wrong tpi->proto in WCCP

Haishuang Yan · davem330 · commit da73b4e9538b · 2016-05-12T16:53:58.000-04:00
When dealing with WCCP in gre6 tunnel, it sets the wrong tpi-&gt;protocol,
that is, ETH_P_IP instead of ETH_P_IPV6 for the encapuslated traffic.

Signed-off-by: Haishuang Yan &lt;yanhaishuang@cmss.chinamobile.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/gre.h b/include/net/gre.h
@@ -26,7 +26,7 @@ int gre_del_protocol(const struct gre_protocol *proto, u8 version);
 struct net_device *gretap_fb_dev_create(struct net *net, const char *name,
 				       u8 name_assign_type);
 int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
-		     bool *csum_err);
+		     bool *csum_err, __be16 proto);
 
 static inline int gre_calc_hlen(__be16 o_flags)
 {
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c
@@ -62,7 +62,7 @@ EXPORT_SYMBOL_GPL(gre_del_protocol);
 
 /* Fills in tpi and returns header length to be pulled. */
 int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
-		     bool *csum_err)
+		     bool *csum_err, __be16 proto)
 {
 	const struct gre_base_hdr *greh;
 	__be32 *options;
@@ -109,11 +109,11 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
 		tpi->seq = 0;
 	}
 	/* WCCP version 1 and 2 protocol decoding.
-	 * - Change protocol to IP
+	 * - Change protocol to IPv4/IPv6
 	 * - When dealing with WCCPv2, Skip extra 4 bytes in GRE header
 	 */
 	if (greh->flags == 0 && tpi->proto == htons(ETH_P_WCCP)) {
-		tpi->proto = htons(ETH_P_IP);
+		tpi->proto = proto;
 		if ((*(u8 *)options & 0xF0) != 0x40)
 			hdr_len += 4;
 	}
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
@@ -222,7 +222,7 @@ static void gre_err(struct sk_buff *skb, u32 info)
 	struct tnl_ptk_info tpi;
 	bool csum_err = false;
 
-	if (gre_parse_header(skb, &tpi, &csum_err) < 0) {
+	if (gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IP)) < 0) {
 		if (!csum_err)		/* ignore csum errors. */
 			return;
 	}
@@ -335,7 +335,7 @@ static int gre_rcv(struct sk_buff *skb)
 	}
 #endif
 
-	hdr_len = gre_parse_header(skb, &tpi, &csum_err);
+	hdr_len = gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IP));
 	if (hdr_len < 0)
 		goto drop;
 
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
@@ -468,7 +468,7 @@ static int gre_rcv(struct sk_buff *skb)
 	bool csum_err = false;
 	int hdr_len;
 
-	hdr_len = gre_parse_header(skb, &tpi, &csum_err);
+	hdr_len = gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IPV6));
 	if (hdr_len < 0)
 		goto drop;
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ int gre_del_protocol(const struct gre_protocol *proto, u8 version);`
`26`	`26`	`struct net_device gretap_fb_dev_create(struct net net, const char *name,`
`27`	`27`	`u8 name_assign_type);`
`28`	`28`	`int gre_parse_header(struct sk_buff skb, struct tnl_ptk_info tpi,`
`29`		`- bool *csum_err);`
	`29`	`+ bool *csum_err, __be16 proto);`
`30`	`30`
`31`	`31`	`static inline int gre_calc_hlen(__be16 o_flags)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ static void gre_err(struct sk_buff *skb, u32 info)`
`222`	`222`	`struct tnl_ptk_info tpi;`
`223`	`223`	`bool csum_err = false;`
`224`	`224`
`225`		`- if (gre_parse_header(skb, &tpi, &csum_err) < 0) {`
	`225`	`+ if (gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IP)) < 0) {`
`226`	`226`	`if (!csum_err) /* ignore csum errors. */`
`227`	`227`	`return;`
`228`	`228`	`}`
`@@ -335,7 +335,7 @@ static int gre_rcv(struct sk_buff *skb)`
`335`	`335`	`}`
`336`	`336`	`#endif`
`337`	`337`
`338`		`- hdr_len = gre_parse_header(skb, &tpi, &csum_err);`
	`338`	`+ hdr_len = gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IP));`
`339`	`339`	`if (hdr_len < 0)`
`340`	`340`	`goto drop;`
`341`	`341`