* Re: Fw: [Bug 195969] New: ipsec icmp and udp works, tcp doesn't work
2017-06-06 19:14 Fw: [Bug 195969] New: ipsec icmp and udp works, tcp doesn't work Stephen Hemminger
@ 2017-06-07 5:50 ` Steffen Klassert
0 siblings, 0 replies; 2+ messages in thread
From: Steffen Klassert @ 2017-06-07 5:50 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Herbert Xu, netdev, dev
Cc the reporter.
On Tue, Jun 06, 2017 at 12:14:39PM -0700, Stephen Hemminger wrote:
>
>
> Begin forwarded message:
>
> Date: Sat, 03 Jun 2017 06:25:05 +0000
> From: bugzilla-daemon@bugzilla.kernel.org
> To: stephen@networkplumber.org
> Subject: [Bug 195969] New: ipsec icmp and udp works, tcp doesn't work
>
>
> https://bugzilla.kernel.org/show_bug.cgi?id=195969
>
> Bug ID: 195969
> Summary: ipsec icmp and udp works, tcp doesn't work
> Product: Networking
> Version: 2.5
> Kernel Version: 4.11.3-1-ARCH
> Hardware: All
> OS: Linux
> Tree: Mainline
> Status: NEW
> Severity: normal
> Priority: P1
> Component: Other
> Assignee: stephen@networkplumber.org
> Reporter: dev@djagoo.io
> Regression: No
>
> A few days ago I updated to 4.11.3-1-ARCH. After that my VPN access to our
> corporate network was broken.
>
> The connection is established and I can use UDP (i.e. DNS) and ICMP. All TCP
> connections I tried (ssh, smb, http...) failed.
Is this with UDP encapsulation?
If so, you could try this patch:
Subject: [PATCH v4.11] esp4: Fix udpencap for local TCP packets.
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@donbowman.ca>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
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.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread