From d3dc2a91cff9c83c10006e075f01c74521e53cfe Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 17 Feb 2018 22:23:45 -0500 Subject: [PATCH] sys-kernel/coreos-sources: Bump 4.14.19 to 4.14.20 --- ...19.ebuild => coreos-kernel-4.14.20.ebuild} | 0 ...9.ebuild => coreos-modules-4.14.20.ebuild} | 0 .../sys-kernel/coreos-sources/Manifest | 2 +- ...9.ebuild => coreos-sources-4.14.20.ebuild} | 7 ++-- ...lative-path-for-KBUILD_SRC-from-CURD.patch | 6 +-- .../z0002-Add-arm64-coreos-verity-hash.patch | 4 +- ...actor-out-__blkdev_issue_zero_pages.patch} | 4 +- ...017-8824-use-after-free-in-DCCP-code.patch | 40 ------------------- ...RITE-ZEROES-failing-in-blkdev_issue.patch} | 4 +- ...efile-Don-t-fail-on-fallthrough-wit.patch} | 4 +- 10 files changed, 15 insertions(+), 56 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.14.19.ebuild => coreos-kernel-4.14.20.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.14.19.ebuild => coreos-modules-4.14.20.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.14.19.ebuild => coreos-sources-4.14.20.ebuild} (81%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/{z0004-block-factor-out-__blkdev_issue_zero_pages.patch => z0003-block-factor-out-__blkdev_issue_zero_pages.patch} (95%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/{z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch => z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch} (96%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/{z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch => z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch} (83%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.19.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.20.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.19.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.20.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.19.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.20.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.19.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.20.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index de93b9fcbd..2a37bfdc75 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/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.15.tar.xz 102181404 SHA256 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea WHIRLPOOL 8f08cf5885c85b9f4959ed52e0c479ff0961143c7c515393c73a7a41dd301f9557f38cfa4093e943989cffd13e11d9524bf75c778a2e9359da4b5d98df222075 -DIST patch-4.14.19.xz 544620 SHA256 627c8bb675b760bf6533a7aacce843e222fb61f702777e6bbfb63db073dd9cbf SHA512 e36c1571872965e419a46102ba17d0ed6a7dc004b6355e29d2154ce9653bceb949c92b7eed527bede7085c6acc3c0829ff2935cc038aa90ea17f44a50b6954b0 WHIRLPOOL 9208bcf8b3f213f2d46fc1632f032fd7a30d69bc2714246d5155dce1a7fbdeff9c665312fb202f53c7cafccb2067ecef9d9573e804d5debf295f09dadd3b9e24 +DIST patch-4.14.20.xz 606524 SHA256 ec38313c7ff463f781fb36502d4b49811a903462f031c5392b95231cc371190f SHA512 1ddddb3a8eeed75bf650b749fa04712d0db67615e4cc6195dc43046797970f3b459299b71366b9a254fa6c6c3896339c3cef65d93b4097ab90a5cfbb6aa1c445 WHIRLPOOL 6f65b6b7d6d19b85a7415b5e2eb6092ad1548f2a0d6a22a05f3d50b79b7778ed1f07ed8b80be88d9e11de59ffcf6d6cb655cf1e4084f04304f0fabdca1480d56 DIST patch-4.15.4.xz 125900 SHA256 5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8 SHA512 e903b02631f5fa261db44ea2da69b6edc3afbbbbb4da5eca6abf2972b9f5aeb032d6b4b22c1313eef7763bc91987ec793b05c00c04a0ec592f61cb5a82cea296 WHIRLPOOL e2b0074a358df15ce031af6b6b5da0ccfd380664058dec4af9abdafc6e588f7795d8f55e9f186322985b373fb4d25f4c7bd2951c36ec065adb1f129be115bc19 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.19.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.20.ebuild similarity index 81% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.19.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.20.ebuild index a911706909..148358acbd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.19.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.20.ebuild @@ -33,8 +33,7 @@ IUSE="" UNIPATCH_LIST=" ${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch \ ${PATCH_DIR}/z0002-Add-arm64-coreos-verity-hash.patch \ - ${PATCH_DIR}/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch \ - ${PATCH_DIR}/z0004-block-factor-out-__blkdev_issue_zero_pages.patch \ - ${PATCH_DIR}/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch \ - ${PATCH_DIR}/z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ + ${PATCH_DIR}/z0003-block-factor-out-__blkdev_issue_zero_pages.patch \ + ${PATCH_DIR}/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch \ + ${PATCH_DIR}/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ " diff --git a/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 b/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 index ac10851da0..e2d18b50df 100644 --- a/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 +++ b/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 35975f928b5b9b20d3f836010cfcbced3712f094 Mon Sep 17 00:00:00 2001 +From 0fca0c005654446e06d4f0bd5ebd6da837f759fa Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/6] kbuild: derive relative path for KBUILD_SRC from CURDIR +Subject: [PATCH 1/5] 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 76a0b13623f4..cc4910a1493c 100644 +index 33176140f133..16206c58e8e4 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch index 68bc5c2d1a..80848c0207 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch +++ b/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 4e59c3210460f7d144259be1253f7f98ee793093 Mon Sep 17 00:00:00 2001 +From f09f2ff8ea5d11d80aa01b79408ed16f8495695c Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 11 Nov 2016 17:28:52 -0800 -Subject: [PATCH 2/6] Add arm64 coreos verity hash +Subject: [PATCH 2/5] Add arm64 coreos verity hash Signed-off-by: Geoff Levand --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-factor-out-__blkdev_issue_zero_pages.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-factor-out-__blkdev_issue_zero_pages.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch index b0a16d56c7..a3e98b35cd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-factor-out-__blkdev_issue_zero_pages.patch +++ b/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 b34533d19cca7525141dfe0b3fbfcb22aa99c6e3 Mon Sep 17 00:00:00 2001 +From 47ee25d1e40caddede4d112ed31981a75ac044a5 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 16 Oct 2017 15:59:09 +0200 -Subject: [PATCH 4/6] block: factor out __blkdev_issue_zero_pages() +Subject: [PATCH 3/5] block: factor out __blkdev_issue_zero_pages() blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch deleted file mode 100644 index a1b66f8547..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6041e7591f8fcea7392a7b158b8045703d54f370 Mon Sep 17 00:00:00 2001 -From: Mohamed Ghannam -Date: Tue, 5 Dec 2017 12:23:04 -0800 -Subject: [PATCH 3/6] dccp: CVE-2017-8824: use-after-free in DCCP code - -Whenever the sock object is in DCCP_CLOSED state, dccp_disconnect() -must free dccps_hc_tx_ccid and dccps_hc_rx_ccid and set to NULL. - -Signed-off-by: Mohamed Ghannam -Reviewed-by: Eric Dumazet ---- - net/dccp/proto.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/net/dccp/proto.c b/net/dccp/proto.c -index b68168fcc06a..9d43c1f40274 100644 ---- a/net/dccp/proto.c -+++ b/net/dccp/proto.c -@@ -259,6 +259,7 @@ int dccp_disconnect(struct sock *sk, int flags) - { - struct inet_connection_sock *icsk = inet_csk(sk); - struct inet_sock *inet = inet_sk(sk); -+ struct dccp_sock *dp = dccp_sk(sk); - int err = 0; - const int old_state = sk->sk_state; - -@@ -278,6 +279,10 @@ int dccp_disconnect(struct sock *sk, int flags) - sk->sk_err = ECONNRESET; - - dccp_clear_xmit_timers(sk); -+ ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk); -+ ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk); -+ dp->dccps_hc_rx_ccid = NULL; -+ dp->dccps_hc_tx_ccid = NULL; - - __skb_queue_purge(&sk->sk_receive_queue); - __skb_queue_purge(&sk->sk_write_queue); --- -2.14.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch b/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 similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch rename to 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 index 10f23d5102..0c558cfe96 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch +++ b/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 e013121dbb48a74c7274dfe0d6a966d1413d4df2 Mon Sep 17 00:00:00 2001 +From e5118a5a1f0c2d93b031c0abf052796cac467abf Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 16 Oct 2017 15:59:10 +0200 -Subject: [PATCH 5/6] block: cope with WRITE ZEROES failing in +Subject: [PATCH 4/5] block: cope with WRITE ZEROES failing in blkdev_issue_zeroout() sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/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 similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch rename 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 index 1096874f86..dfd2adefb4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/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 c68d17663fa6b43993d5fc0e8456511fbda10455 Mon Sep 17 00:00:00 2001 +From 2d24ec4d7da24bcf2d54cafd9629ee7ec6215c11 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 -Subject: [PATCH 6/6] tools/objtool/Makefile: Don't fail on fallthrough with +Subject: [PATCH 5/5] tools/objtool/Makefile: Don't fail on fallthrough with new GCCs ---