Skip to contentSkip to conversation

Patch "sit: reload iphdr in ipip6_rcv" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Apr 10, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

sit: reload iphdr in ipip6_rcv

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
sit-reload-iphdr-in-ipip6_rcv.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Tue Apr 10 10:31:53 CEST 2018

From: Haishuang Yan <[email protected]>
Date: Sun, 4 Jun 2017 14:43:43 +0800
Subject: sit: reload iphdr in ipip6_rcv

From: Haishuang Yan <[email protected]>

[ Upstream commit b699d0035836f6712917a41e7ae58d84359b8ff9 ]

Since iptunnel_pull_header() can call pskb_may_pull(), we must reload any pointer that was related to skb->head.

Fixes a09a4c8dd1ec ("tunnels: Remove encapsulation offloads on decap")
---
 net/ipv6/sit.c |    1 +
 1 file changed, 1 insertion(+)
net/ipv6/sit.c +1 -0
@@ -690,6 +690,7 @@ static int ipip6_rcv(struct sk_buff *skb
 
 		if (iptunnel_pull_header(skb, 0, htons(ETH_P_IPV6)))
 			goto out;
+		iph = ip_hdr(skb);
 
 		err = IP_ECN_decapsulate(iph, skb);
 		if (unlikely(err)) {

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/sit-reload-iphdr-in-ipip6_rcv.patch