Merge pull request #3295 from dm0-/linux

Bump Linux 4.14.49 to 4.14.50 and 4.16.15 to 4.16.16

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest

@@ -1,4 +1,4 @@
 DIST linux-4.14.tar.xz 100770500 SHA256 f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 WHIRLPOOL fee10d54ecb210156aa55364ecc15867127819e9f7ff9ec5f6ef159b1013e2ae3d3a28d35c62d663886cbe826b996a1387671766093be002536309045a8e4d10
 DIST linux-4.16.tar.xz 103020152 SHA256 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662 WHIRLPOOL e03466f20fbac5b54c963845449d88589cb01fcc47837adbcf7ed1fb7b74422251df3a9a83f3a74d79f086a0f2eaa3cdf3654869717c72c3fb3a195f3f721942
-DIST patch-4.14.49.xz 1309408 SHA256 b195e0a097b858d06d1b7869e32785511c67e535269f804b55a053d8ca05c8c4 SHA512 656348c981d451f8f53f5e5532b20f49180acb1279417c2a37eee8797454baaad61178509f0c8d3ec4c824561dd0bde890caddcdd4539b91ac29ac80e5bde92d WHIRLPOOL 330e3dee57d794fa006594e7d20ea4a8ed48825c1cae5b472876662b0de410be6a850b353a15e1cf9a78c01c8d41783f7809b18e69b157e506b558c43867df0e
-DIST patch-4.16.15.xz 400912 SHA256 5c53d2e38208c1616c4b7139a666e91d87d5e10538b70a4f410b5f11e187866a SHA512 496a8a85758b4bae9b3082c45d7e9c8a87bd10a8a2ffbb086f96b83e0ed2e3449ebe8bdd50d138219a55c96a93dd87c9d4802dc0962112e8e78115de77d3c363 WHIRLPOOL 0df3d78d7dbd0b2ea6933b43a9398748c1025213d2f45c76ff88d7af3e68245c3cec237bccfb29c24f9c0c42c3e3fd4e21b8ac8982b49afe8ee024ab8e334278
+DIST patch-4.14.50.xz 1322596 SHA256 c7bd70353f2a44c164e0913cda4f73892c8edfecd8852f45282be96493a383c7 SHA512 8c97ad53422883dd7fe12e9a41d5e1f9b860183a140232341c1338636777830e5accae8c6469990e7caa120c1263565ea57bf0d4bfab86128e896d22007dfebc WHIRLPOOL 97678d5440fe09257cdc9d21f88a331dcbf04fc6da5e478c87f6388f7c75f7d6a173ea6c9a38bc5e289e44bad1a3b33cf8cfea8786e7c1133fc5bc921db0fdaa
+DIST patch-4.16.16.xz 416824 SHA256 fd8a68ffcc729e69f0c0a3d202d08d7c5fa612d1ac65dfff3c5ef2f64d183a2e SHA512 9b3fdf982b16a7962305acb03adfa7ff077cba82bac02e1f7bc8cf6a6b6a4f4ef6c16c5e83d024fb0bd3763740c0e6169f4c236eaf6e175ed77dce49e4a06e9c WHIRLPOOL f5500db0e71749a30a3c555e3d72c89f1f04e04fc48139bf0e1560e3d0d4f551ae8e33ff26abd71205caae04b05f73650821a508832fcec32e430dfa5e65bed3

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.50.ebuild

@@ -40,4 +40,5 @@ UNIPATCH_LIST="
 	${PATCH_DIR}/z0007-Revert-random-fix-crng_ready-test.patch \
 	${PATCH_DIR}/z0008-Revert-xen-netfront-Fix-race-between-device-setup-an.patch \
 	${PATCH_DIR}/z0009-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch \
+	${PATCH_DIR}/z0010-Revert-tcp-avoid-integer-overflows-in-tcp_rcv_space_.patch \
 "

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch

@@ -1,7 +1,7 @@
-From cc0dfe854bd4fc60e131598cb91a7e310fe4b3a6 Mon Sep 17 00:00:00 2001
+From fcb948eece10e06fe06fb4494caf9fdfdd6b4d2c Mon Sep 17 00:00:00 2001
 From: Vito Caputo <vito.caputo@coreos.com>
 Date: Wed, 25 Nov 2015 02:59:45 -0800
-Subject: [PATCH 1/9] kbuild: derive relative path for KBUILD_SRC from CURDIR
+Subject: [PATCH 01/10] kbuild: derive relative path for KBUILD_SRC from CURDIR
 
 This enables relocating source and build trees to different roots,
 provided they stay reachable relative to one another.  Useful for
@@ -12,7 +12,7 @@ by some undesirable path component.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 480ae7ef755c..bdd1ed4513d3 100644
+index 84374c5ba60e..ca7f7ac9fa47 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch

@@ -1,7 +1,7 @@
-From 75153d2a78d1a38a26694d0a7d1c98ce87228e0e Mon Sep 17 00:00:00 2001
+From e49558ee8d018ac05a4469bf01382bafc9a048d5 Mon Sep 17 00:00:00 2001
 From: Geoff Levand <geoff@infradead.org>
 Date: Fri, 11 Nov 2016 17:28:52 -0800
-Subject: [PATCH 2/9] Add arm64 coreos verity hash
+Subject: [PATCH 02/10] Add arm64 coreos verity hash
 
 Signed-off-by: Geoff Levand <geoff@infradead.org>
 ---

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch

@@ -1,7 +1,7 @@
-From 6ff5b8ec024a1236d044f9901aa9ba6edeb289da Mon Sep 17 00:00:00 2001
+From 9f7f43fd19e1f187b6c7af56c12b37412ce1a95e Mon Sep 17 00:00:00 2001
 From: Ilya Dryomov <idryomov@gmail.com>
 Date: Mon, 16 Oct 2017 15:59:09 +0200
-Subject: [PATCH 3/9] block: factor out __blkdev_issue_zero_pages()
+Subject: [PATCH 03/10] block: factor out __blkdev_issue_zero_pages()
 
 blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case.
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch

@@ -1,7 +1,7 @@
-From 809f83bb015b3b620861d3fc0eac556984448733 Mon Sep 17 00:00:00 2001
+From 40a0c092644b1fc1a40ca40ecee69cd1ae680c39 Mon Sep 17 00:00:00 2001
 From: Ilya Dryomov <idryomov@gmail.com>
 Date: Mon, 16 Oct 2017 15:59:10 +0200
-Subject: [PATCH 4/9] block: cope with WRITE ZEROES failing in
+Subject: [PATCH 04/10] block: cope with WRITE ZEROES failing in
  blkdev_issue_zeroout()
 
 sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch

@@ -1,7 +1,7 @@
-From 562344da2f7d2c8f1278cf4c95b7c54bb80d9de2 Mon Sep 17 00:00:00 2001
+From 5bdea3c19f5389dbfbeae40516e928eb863dd94b Mon Sep 17 00:00:00 2001
 From: David Michael <david.michael@coreos.com>
 Date: Thu, 8 Feb 2018 21:23:12 -0500
-Subject: [PATCH 5/9] tools/objtool/Makefile: Don't fail on fallthrough with
+Subject: [PATCH 05/10] tools/objtool/Makefile: Don't fail on fallthrough with
  new GCCs
 
 ---

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch

@@ -1,7 +1,7 @@
-From 26b0eba60aa7c139962b0df4ed0901bc643fe37b Mon Sep 17 00:00:00 2001
+From fac257156dd280c567194b905d37f05b73f0a989 Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jeremy@jcline.org>
 Date: Wed, 2 May 2018 15:16:29 -0400
-Subject: [PATCH 6/9] Revert "random: use a different mixing algorithm for
+Subject: [PATCH 06/10] Revert "random: use a different mixing algorithm for
  add_device_randomness()"
 
 This reverts commit 7b6b1f3a192372937164d1293b432c640ffc7c8f.

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-Revert-random-fix-crng_ready-test.patch

@@ -1,7 +1,7 @@
-From 3a7b6b26d7f7474f0624931da29cf3d4d870e106 Mon Sep 17 00:00:00 2001
+From e456073beb4d9e86664eec2bbb928b6644b22b6c Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jeremy@jcline.org>
 Date: Wed, 2 May 2018 15:18:03 -0400
-Subject: [PATCH 7/9] Revert "random: fix crng_ready() test"
+Subject: [PATCH 07/10] Revert "random: fix crng_ready() test"
 
 This reverts commit 6e513bc20ca63f594632eca4e1968791240b8f18.
 ---

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0008-Revert-xen-netfront-Fix-race-between-device-setup-an.patch

@@ -1,7 +1,7 @@
-From ad7e5a6e8bb7fa636275e1d81e202b2a27001319 Mon Sep 17 00:00:00 2001
+From 4096a812cd7b9ee8e9aad5b68914174577532ded Mon Sep 17 00:00:00 2001
 From: Andrew Jeddeloh <andrew.jeddeloh@coreos.com>
 Date: Wed, 30 May 2018 17:45:35 -0700
-Subject: [PATCH 8/9] Revert "xen-netfront: Fix race between device setup and
+Subject: [PATCH 08/10] Revert "xen-netfront: Fix race between device setup and
  open"
 
 This reverts commit 70f3461c23ffb394676cb53c2eb1095208a52327.

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0009-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch

@@ -1,7 +1,7 @@
-From 697cf22ae79eb8f40e850f111a78f6617a6ff39a Mon Sep 17 00:00:00 2001
+From 85c9abf8a7c129363a8e6ae434dbeb9ac95eca90 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 6 Jun 2018 21:32:51 +0000
-Subject: [PATCH 9/9] hv_netvsc: Fix a network regression after ifdown/ifup
+Subject: [PATCH 09/10] hv_netvsc: Fix a network regression after ifdown/ifup
 
 Recently people reported the NIC stops working after
 "ifdown eth0; ifup eth0". It turns out in this case the TX queues are not

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0010-Revert-tcp-avoid-integer-overflows-in-tcp_rcv_space_.patch

@@ -0,0 +1,68 @@
+From ab066c9c7679eafddcbb1521449b4ce158ed2f40 Mon Sep 17 00:00:00 2001
+From: Benjamin Gilbert <bgilbert@redhat.com>
+Date: Thu, 14 Jun 2018 00:43:06 -0400
+Subject: [PATCH 10/10] Revert "tcp: avoid integer overflows in
+ tcp_rcv_space_adjust()"
+
+This reverts commit a6f81fcb2c3905c28641837dc823ed34617eb110.
+---
+ include/linux/tcp.h  |  2 +-
+ net/ipv4/tcp_input.c | 10 ++++------
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/include/linux/tcp.h b/include/linux/tcp.h
+index fe322fa611e6..e8418fc77a43 100644
+--- a/include/linux/tcp.h
++++ b/include/linux/tcp.h
+@@ -334,7 +334,7 @@ struct tcp_sock {
+ 
+ /* Receiver queue space */
+ 	struct {
+-		u32	space;
++		int	space;
+ 		u32	seq;
+ 		u64	time;
+ 	} rcvq_space;
+diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
+index 125b49c166a4..ebbb54bcbcac 100644
+--- a/net/ipv4/tcp_input.c
++++ b/net/ipv4/tcp_input.c
+@@ -591,8 +591,8 @@ static inline void tcp_rcv_rtt_measure_ts(struct sock *sk,
+ void tcp_rcv_space_adjust(struct sock *sk)
+ {
+ 	struct tcp_sock *tp = tcp_sk(sk);
+-	u32 copied;
+ 	int time;
++	int copied;
+ 
+ 	tcp_mstamp_refresh(tp);
+ 	time = tcp_stamp_us_delta(tp->tcp_mstamp, tp->rcvq_space.time);
+@@ -615,13 +615,12 @@ void tcp_rcv_space_adjust(struct sock *sk)
+ 
+ 	if (sysctl_tcp_moderate_rcvbuf &&
+ 	    !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
+-		int rcvmem, rcvbuf;
+-		u64 rcvwin;
++		int rcvwin, rcvmem, rcvbuf;
+ 
+ 		/* minimal window to cope with packet losses, assuming
+ 		 * steady state. Add some cushion because of small variations.
+ 		 */
+-		rcvwin = ((u64)copied << 1) + 16 * tp->advmss;
++		rcvwin = (copied << 1) + 16 * tp->advmss;
+ 
+ 		/* If rate increased by 25%,
+ 		 *	assume slow start, rcvwin = 3 * copied
+@@ -641,8 +640,7 @@ void tcp_rcv_space_adjust(struct sock *sk)
+ 		while (tcp_win_from_space(rcvmem) < tp->advmss)
+ 			rcvmem += 128;
+ 
+-		do_div(rcvwin, tp->advmss);
+-		rcvbuf = min_t(u64, rcvwin * rcvmem, sysctl_tcp_rmem[2]);
++		rcvbuf = min(rcvwin / tp->advmss * rcvmem, sysctl_tcp_rmem[2]);
+ 		if (rcvbuf > sk->sk_rcvbuf) {
+ 			sk->sk_rcvbuf = rcvbuf;
+ 
+-- 
+2.14.4
+

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch

@@ -1,4 +1,4 @@
-From 7e3f281fc123b8cf78692e8795f7e5d8d08c45f3 Mon Sep 17 00:00:00 2001
+From c934df48e3fdb07b3a5dcac996452674ce0cd955 Mon Sep 17 00:00:00 2001
 From: Vito Caputo <vito.caputo@coreos.com>
 Date: Wed, 25 Nov 2015 02:59:45 -0800
 Subject: [PATCH 1/7] kbuild: derive relative path for KBUILD_SRC from CURDIR
@@ -12,7 +12,7 @@ by some undesirable path component.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index e45c66b27241..b6e2d609151b 100644
+index 55554f392115..9ded058763e2 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0002-Add-arm64-coreos-verity-hash.patch

@@ -1,4 +1,4 @@
-From a074da1264f88bce378d3617f7e8de5ba9948674 Mon Sep 17 00:00:00 2001
+From 9220387321c9b0b6e9c96c9ad98f9271c1eebb44 Mon Sep 17 00:00:00 2001
 From: Geoff Levand <geoff@infradead.org>
 Date: Fri, 11 Nov 2016 17:28:52 -0800
 Subject: [PATCH 2/7] Add arm64 coreos verity hash

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch

@@ -1,4 +1,4 @@
-From 4578249ee2dd8f6299eb38bfbc4e3c383d95e755 Mon Sep 17 00:00:00 2001
+From 767510c3688a4c050b5d24abd6d74fd2c9903b4e Mon Sep 17 00:00:00 2001
 From: David Michael <david.michael@coreos.com>
 Date: Thu, 8 Feb 2018 21:23:12 -0500
 Subject: [PATCH 3/7] tools/objtool/Makefile: Don't fail on fallthrough with

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch

@@ -1,4 +1,4 @@
-From e4f2578e292c8d118a5a54e7cc873386c22a75a3 Mon Sep 17 00:00:00 2001
+From 14f77eb4f56b8ffc3d58578d9a4becc428b88acb Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jeremy@jcline.org>
 Date: Wed, 2 May 2018 15:16:29 -0400
 Subject: [PATCH 4/7] Revert "random: use a different mixing algorithm for

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch

@@ -1,4 +1,4 @@
-From b92ee9c37f9a40713fdd1927e143cdd974c8838a Mon Sep 17 00:00:00 2001
+From 5b8bd7d6b701373929475e6c1fc8d3ccd5107a0b Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jeremy@jcline.org>
 Date: Wed, 2 May 2018 15:18:03 -0400
 Subject: [PATCH 5/7] Revert "random: fix crng_ready() test"

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch

@@ -1,4 +1,4 @@
-From 8513476980eda94a7e26e6dd98a81600a0502747 Mon Sep 17 00:00:00 2001
+From 77f4111c5d3eed440436da7affae4c39c7bbf5ac Mon Sep 17 00:00:00 2001
 From: Andrew Jeddeloh <andrew.jeddeloh@coreos.com>
 Date: Wed, 30 May 2018 17:50:37 -0700
 Subject: [PATCH 6/7] Revert "xen-netfront: Fix race between device setup and

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0007-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch

@@ -1,4 +1,4 @@
-From e27a245de9e2e8a720f5eee1c76e3a421fe73187 Mon Sep 17 00:00:00 2001
+From 3e8f06a2a65cdf01ab0b9c6e28f90471a8d327bf Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 6 Jun 2018 21:32:51 +0000
 Subject: [PATCH 7/7] hv_netvsc: Fix a network regression after ifdown/ifup