Linux v4.11.9
This commit is contained in:
parent
8164fce49d
commit
1fba72eb71
|
@ -1,45 +0,0 @@
|
|||
From: Steffen Klassert <steffen.klassert@secunet.com>
|
||||
Subject: [PATCH] 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.
|
||||
|
||||
Fixes: commit cac2661c53f ("esp4: Avoid skb_cow_data whenever possible")
|
||||
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..ab71fbb 100644
|
||||
--- a/net/ipv4/esp4.c
|
||||
+++ b/net/ipv4/esp4.c
|
||||
@@ -223,6 +223,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
|
||||
int extralen;
|
||||
int tailen;
|
||||
__be64 seqno;
|
||||
+ int esp_offset = 0;
|
||||
__u8 proto = *skb_mac_header(skb);
|
||||
|
||||
/* skb is pure payload to encrypt */
|
||||
@@ -288,6 +289,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
|
||||
break;
|
||||
}
|
||||
|
||||
+ esp_offset = (unsigned char *)esph - (unsigned char *)uh;
|
||||
+
|
||||
*skb_mac_header(skb) = IPPROTO_UDP;
|
||||
}
|
||||
|
||||
@@ -397,7 +400,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
|
||||
goto error;
|
||||
nfrags = err;
|
||||
tail = skb_tail_pointer(trailer);
|
||||
- esph = ip_esp_hdr(skb);
|
||||
+ esph = (struct ip_esp_hdr *)(skb_transport_header(skb) + esp_offset);
|
||||
|
||||
skip_cow:
|
||||
esp_output_fill_trailer(tail, tfclen, plen, proto);
|
|
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 8
|
||||
%define stable_update 9
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
@ -624,10 +624,6 @@ Patch867: 0002-NFSv4-Fix-callback-server-shutdown.patch
|
|||
# rhbz 1455780
|
||||
Patch676: 2-2-nvme-Quirk-APST-on-Intel-600P-P3100-devices.patch
|
||||
|
||||
# rhbz 1458222 1458499
|
||||
# As linked from http://marc.info/?l=linux-netdev&m=149336766030175&w=2
|
||||
Patch679: actual_udpencap_fix.patch
|
||||
|
||||
# rhbz 1459272
|
||||
Patch680: 0001-platform-x86-thinkpad_acpi-guard-generic-hotkey-case.patch
|
||||
Patch681: 0002-platform-x86-thinkpad_acpi-add-mapping-for-new-hotke.patch
|
||||
|
@ -2199,6 +2195,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed Jul 05 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.9-200
|
||||
- Linux v4.11.9
|
||||
|
||||
* Thu Jun 29 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.8-200
|
||||
- Linux v4.11.8
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1,3 +1,3 @@
|
|||
SHA512 (perf-man-4.11.tar.gz) = 0b070d2f10a743329de2f532e2d7e19ef385a3e6ef3c700b591ae2697604dbe542b36e31121b3e37517ee8071ab800386fa8663c24a5b36520a18e096c6eefc8
|
||||
SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
|
||||
SHA512 (patch-4.11.8.xz) = 9fed139ec4658d373ea6f25b0cc0cd9384e3bf61a05d30a523c13d8b5e673b461cf3cc8d97da2c69ca3a6c718319529f7ccfd90ca38b81d68986b7e63f2db297
|
||||
SHA512 (patch-4.11.9.xz) = 0d9474810b175679ae1a6e1c59ea60da8d2c5fafdd736a827cf1abe5bbd99361a31a4584d3bc160ed83322d7876e822dbd537adf12c22a2dcec45acfcd645bca
|
||||
|
|
Loading…
Reference in New Issue