This is a note to let you know that I've just added the patch titled [PATCH] esp4: Fix udpencap for local TCP packets. to the 4.11-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: esp4-fix-udpencap-for-local-tcp-packets.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 20218ba11828773f48fad8fcf23d9ba7b6cfb711 Mon Sep 17 00:00:00 2001 From: Steffen Klassert <steffen.klassert@xxxxxxxxxxx> Date: Fri, 9 Jun 2017 11:35:46 +0200 Subject: [PATCH] esp4: Fix udpencap for local TCP packets. From: Steffen Klassert <steffen.klassert@xxxxxxxxxxx> [ Upstream commit 0e78a87306a6f55b1c7bbafad1de62c3975953ca ] Locally generated TCP packets are usually cloned, so we do skb_cow_data() on this packets. After that we need to reload the pointer to the esp header. On udpencap this header has an offset to skb_transport_header, so take this offset into account. This is a backport of: commit 0e78a87306a ("esp4: Fix udpencap for local TCP packets.") Fixes: 67d349ed603 ("net/esp4: Fix invalid esph pointer crash") Fixes: fca11ebde3f0 ("esp4: Reorganize esp_output") Reported-by: Don Bowman <db@xxxxxxxxxxxx> Signed-off-by: Steffen Klassert <steffen.klassert@xxxxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/ipv4/esp4.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index b1e2444..9708a32 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -212,6 +212,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) u8 *iv; u8 *tail; u8 *vaddr; + int esph_offset; int blksize; int clen; int alen; @@ -392,12 +393,14 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) } cow: + esph_offset = (unsigned char *)esph - skb_transport_header(skb); + err = skb_cow_data(skb, tailen, &trailer); if (err < 0) goto error; nfrags = err; tail = skb_tail_pointer(trailer); - esph = ip_esp_hdr(skb); + esph = (struct ip_esp_hdr *)(skb_transport_header(skb) + esph_offset); skip_cow: esp_output_fill_trailer(tail, tfclen, plen, proto); -- 2.9.4 Patches currently in stable-queue which might be from steffen.klassert@xxxxxxxxxxx are queue-4.11/xfrm-oops-on-error-in-pfkey_msg2xfrm_state.patch queue-4.11/xfrm-move-xfrm_garbage_collect-out-of-xfrm_policy_flush.patch queue-4.11/xfrm-fix-stack-access-out-of-bounds-with-config_xfrm_sub_policy.patch queue-4.11/xfrm-null-dereference-on-allocation-failure.patch queue-4.11/esp4-fix-udpencap-for-local-tcp-packets.patch queue-4.11/xfrm6-fix-ipv6-payload_len-in-xfrm6_transport_finish.patch