diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-05 22:13:49 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-05 22:13:49 +0200 |
| commit | 47717dc901c378af37172e9e75e97f9b28d7999b (patch) | |
| tree | 1bb4963f11a5c1d06c0b3ca792a863a953abb017 | |
| parent | 9b3462958198145d54fbe169777422e25c94608f (diff) | |
| parent | 1fba72eb717b35fd45fe23434f790956ab7569f2 (diff) | |
| download | kernel-4.11.9-200.vanilla.knurd.1.fc25.tar.gz kernel-4.11.9-200.vanilla.knurd.1.fc25.tar.xz kernel-4.11.9-200.vanilla.knurd.1.fc25.zip | |
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.11.9-200.vanilla.knurd.1.fc25
| -rw-r--r-- | actual_udpencap_fix.patch | 45 | ||||
| -rw-r--r-- | kernel.spec | 9 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 5 insertions, 51 deletions
diff --git a/actual_udpencap_fix.patch b/actual_udpencap_fix.patch deleted file mode 100644 index bba8b7676..000000000 --- a/actual_udpencap_fix.patch +++ /dev/null @@ -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); diff --git a/kernel.spec b/kernel.spec index 8dbe76bc3..37cc0ade2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -58,7 +58,7 @@ Summary: The Linux kernel %define stable_rc 0 # 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} @@ -641,10 +641,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 @@ -2219,6 +2215,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 @@ -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 |