[PATCH 3.16.y-ckt 153/168] ipv6: gre: fix wrong skb->protocol in WCCP
Luis Henriques
luis.henriques at canonical.com
Mon Dec 15 14:26:47 UTC 2014
3.16.7-ckt3 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuri Chislov <yuri.chislov at gmail.com>
commit be6572fdb1bfbe23b2624d477de50af50b02f5d6 upstream.
When using GRE redirection in WCCP, it sets the wrong skb->protocol,
that is, ETH_P_IP instead of ETH_P_IPV6 for the encapuslated traffic.
Fixes: c12b395a4664 ("gre: Support GRE over IPv6")
Cc: Dmitry Kozlov <xeb at mail.ru>
Signed-off-by: Yuri Chislov <yuri.chislov at gmail.com>
Tested-by: Yuri Chislov <yuri.chislov at gmail.com>
Signed-off-by: Daniel Borkmann <dborkman at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
net/ipv6/ip6_gre.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index c3ba41cef1df..0baac7127c57 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -499,11 +499,11 @@ static int ip6gre_rcv(struct sk_buff *skb)
skb->protocol = gre_proto;
/* WCCP version 1 and 2 protocol decoding.
- * - Change protocol to IP
+ * - Change protocol to IPv6
* - When dealing with WCCPv2, Skip extra 4 bytes in GRE header
*/
if (flags == 0 && gre_proto == htons(ETH_P_WCCP)) {
- skb->protocol = htons(ETH_P_IP);
+ skb->protocol = htons(ETH_P_IPV6);
if ((*(h + offset) & 0xF0) != 0x40)
offset += 4;
}
--
2.1.3
More information about the kernel-team
mailing list