diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2017-06-09 11:35:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-05 14:41:43 +0200 |
| commit | a5afcf8553e94d3002e1fbfeda82046dbfeb87e6 (patch) | |
| tree | c6bc84963bdba0f67ccebcf245fbbfb22ac93148 /net | |
| parent | b9a1254c31cc63d1f30fa37b782ebab70e9f0665 (diff) | |
esp4: Fix udpencap for local TCP packets.
[ 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@donbowman.ca>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/esp4.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index b1e24446e297..9708a32b1f26 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); |