mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-20 22:11:39 +02:00
sys-kernel/coreos-sources: Bump 4.14.38 to 4.14.39
Also add reverts of the random changes introducing boot delays.
This commit is contained in:
parent
f43d5a4962
commit
e1383f6822
@ -1,4 +1,4 @@
|
|||||||
DIST linux-4.14.tar.xz 100770500 SHA256 f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 WHIRLPOOL fee10d54ecb210156aa55364ecc15867127819e9f7ff9ec5f6ef159b1013e2ae3d3a28d35c62d663886cbe826b996a1387671766093be002536309045a8e4d10
|
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 linux-4.16.tar.xz 103020152 SHA256 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662 WHIRLPOOL e03466f20fbac5b54c963845449d88589cb01fcc47837adbcf7ed1fb7b74422251df3a9a83f3a74d79f086a0f2eaa3cdf3654869717c72c3fb3a195f3f721942
|
||||||
DIST patch-4.14.38.xz 1070636 SHA256 b8da661a19eae171b8e109b84311dcb144e37f5bde314439b0c3f0387016ed14 SHA512 735e7f55776a2d0fea3d626c98b8eef1e803d6e0edbfc74212f9ada7c1fc9bca45b0aade4418860ef21feef4af39e774855877f3d3c354c3fe842447525d9750 WHIRLPOOL a80e1daaef615c99fc3078647fb0a05c334dee75e49eb556a4ab55f750ddcf139048f3bb53f618199d6441045b710d78751cd556bd1e99843e868c986e66f7b4
|
DIST patch-4.14.39.xz 1091116 SHA256 8686e9a0ff123163799f098767c91af4a0d58bc789a7de2cfe9d7b886f5b4fbd SHA512 28568e50fc70016426b65706f3de12cd723d7e5d5d88a23bbb02915b221db904744108328c3a63bb3f620e059f116930bb0b2d16271b53ed70dc320f6f3daf69 WHIRLPOOL 3890a928bf21c8f3dbfaed4ef6983c97d19982b51f7f4193101258406c0993a738e494f06a9e23bcf6d3ebb9b650a9a807cd2be5efcfaad17ea06bbf6907af61
|
||||||
DIST patch-4.16.6.xz 136560 SHA256 634d3fd97e5d9d90262db0a9d62ed0a40043eb691d68bd4a545f907079610b56 SHA512 151f3fedfb025f090e0f3d747890366933236b11d1f2bf8794c7d0309f9bb577c01fbfcd6ac073b3c49657543961592c643e896c6a57fe8df6ecde89270d0b36 WHIRLPOOL bfe4e7fdf80ec765d65583144e181ba448d12be6c3ddec069a3ac574b97fd22376062be118b9b457cc2c5d89a0853ae24b83848d071716b2a986b4336c90fa46
|
DIST patch-4.16.6.xz 136560 SHA256 634d3fd97e5d9d90262db0a9d62ed0a40043eb691d68bd4a545f907079610b56 SHA512 151f3fedfb025f090e0f3d747890366933236b11d1f2bf8794c7d0309f9bb577c01fbfcd6ac073b3c49657543961592c643e896c6a57fe8df6ecde89270d0b36 WHIRLPOOL bfe4e7fdf80ec765d65583144e181ba448d12be6c3ddec069a3ac574b97fd22376062be118b9b457cc2c5d89a0853ae24b83848d071716b2a986b4336c90fa46
|
||||||
|
@ -37,4 +37,6 @@ UNIPATCH_LIST="
|
|||||||
${PATCH_DIR}/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.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 \
|
${PATCH_DIR}/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
|
||||||
${PATCH_DIR}/z0006-net-don-t-call-update_pmtu-unconditionally.patch \
|
${PATCH_DIR}/z0006-net-don-t-call-update_pmtu-unconditionally.patch \
|
||||||
|
${PATCH_DIR}/z0007-Revert-random-use-a-different-mixing-algorithm-for-a.patch \
|
||||||
|
${PATCH_DIR}/z0008-Revert-random-fix-crng_ready-test.patch \
|
||||||
"
|
"
|
@ -1,7 +1,7 @@
|
|||||||
From 7b532efefba3ddcead7c08c1b21dadd83f7dddca Mon Sep 17 00:00:00 2001
|
From b01ce574a3dbe02a1ba268d642cb2c2f9e04610f Mon Sep 17 00:00:00 2001
|
||||||
From: Vito Caputo <vito.caputo@coreos.com>
|
From: Vito Caputo <vito.caputo@coreos.com>
|
||||||
Date: Wed, 25 Nov 2015 02:59:45 -0800
|
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/8] kbuild: derive relative path for KBUILD_SRC from CURDIR
|
||||||
|
|
||||||
This enables relocating source and build trees to different roots,
|
This enables relocating source and build trees to different roots,
|
||||||
provided they stay reachable relative to one another. Useful for
|
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(-)
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
index 27a8d5c37180..85dee9b889dc 100644
|
index 248b99283f71..52ac28192bce 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 14daa486b3dc5715d5ccd1c9eee7590b2e3de4ae Mon Sep 17 00:00:00 2001
|
From 55c9d1b4cb5171ae43a41b7f40a14155e3378bb6 Mon Sep 17 00:00:00 2001
|
||||||
From: Geoff Levand <geoff@infradead.org>
|
From: Geoff Levand <geoff@infradead.org>
|
||||||
Date: Fri, 11 Nov 2016 17:28:52 -0800
|
Date: Fri, 11 Nov 2016 17:28:52 -0800
|
||||||
Subject: [PATCH 2/6] Add arm64 coreos verity hash
|
Subject: [PATCH 2/8] Add arm64 coreos verity hash
|
||||||
|
|
||||||
Signed-off-by: Geoff Levand <geoff@infradead.org>
|
Signed-off-by: Geoff Levand <geoff@infradead.org>
|
||||||
---
|
---
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From fa9fef0177f9f9828d6901b1961fb7afcf753b13 Mon Sep 17 00:00:00 2001
|
From ab9f78195a96f734ae16f86b891b371f91120ce2 Mon Sep 17 00:00:00 2001
|
||||||
From: Ilya Dryomov <idryomov@gmail.com>
|
From: Ilya Dryomov <idryomov@gmail.com>
|
||||||
Date: Mon, 16 Oct 2017 15:59:09 +0200
|
Date: Mon, 16 Oct 2017 15:59:09 +0200
|
||||||
Subject: [PATCH 3/6] block: factor out __blkdev_issue_zero_pages()
|
Subject: [PATCH 3/8] block: factor out __blkdev_issue_zero_pages()
|
||||||
|
|
||||||
blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case.
|
blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case.
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 7ba58ec790b9d2c44c55c84a08b44c968daf5bb5 Mon Sep 17 00:00:00 2001
|
From 828a36750859ed7102c186d34aec3e59cca5d708 Mon Sep 17 00:00:00 2001
|
||||||
From: Ilya Dryomov <idryomov@gmail.com>
|
From: Ilya Dryomov <idryomov@gmail.com>
|
||||||
Date: Mon, 16 Oct 2017 15:59:10 +0200
|
Date: Mon, 16 Oct 2017 15:59:10 +0200
|
||||||
Subject: [PATCH 4/6] block: cope with WRITE ZEROES failing in
|
Subject: [PATCH 4/8] block: cope with WRITE ZEROES failing in
|
||||||
blkdev_issue_zeroout()
|
blkdev_issue_zeroout()
|
||||||
|
|
||||||
sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to
|
sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 93200678e09fbfdd537830491cb41ad90dcc79c5 Mon Sep 17 00:00:00 2001
|
From abb1256ed29052f60998d493fa776df3c9301aa2 Mon Sep 17 00:00:00 2001
|
||||||
From: David Michael <david.michael@coreos.com>
|
From: David Michael <david.michael@coreos.com>
|
||||||
Date: Thu, 8 Feb 2018 21:23:12 -0500
|
Date: Thu, 8 Feb 2018 21:23:12 -0500
|
||||||
Subject: [PATCH 5/6] tools/objtool/Makefile: Don't fail on fallthrough with
|
Subject: [PATCH 5/8] tools/objtool/Makefile: Don't fail on fallthrough with
|
||||||
new GCCs
|
new GCCs
|
||||||
|
|
||||||
---
|
---
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 04148d3c855300d33391401a14110daaf19c22bb Mon Sep 17 00:00:00 2001
|
From 041394c0f00b8c9232bb8160d4c2a0bc386afedc Mon Sep 17 00:00:00 2001
|
||||||
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
|
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
|
||||||
Date: Thu, 25 Jan 2018 19:03:03 +0100
|
Date: Thu, 25 Jan 2018 19:03:03 +0100
|
||||||
Subject: [PATCH 6/6] net: don't call update_pmtu unconditionally
|
Subject: [PATCH 6/8] net: don't call update_pmtu unconditionally
|
||||||
|
|
||||||
Commit f15ca723c1ebe6c1a06bc95fda6b62cd87b44559 upstream.
|
Commit f15ca723c1ebe6c1a06bc95fda6b62cd87b44559 upstream.
|
||||||
|
|
||||||
|
@ -0,0 +1,96 @@
|
|||||||
|
From cd5d57a0ca6a544157631df57273a24c9af3401f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jeremy Cline <jeremy@jcline.org>
|
||||||
|
Date: Wed, 2 May 2018 15:16:29 -0400
|
||||||
|
Subject: [PATCH 7/8] Revert "random: use a different mixing algorithm for
|
||||||
|
add_device_randomness()"
|
||||||
|
|
||||||
|
This reverts commit 89b59f050347d376c2ace8b1ceb908a218cfdc2e.
|
||||||
|
|
||||||
|
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
|
||||||
|
---
|
||||||
|
drivers/char/random.c | 55 ++++-----------------------------------------------
|
||||||
|
1 file changed, 4 insertions(+), 51 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/char/random.c b/drivers/char/random.c
|
||||||
|
index ddc493d976fd..42ed176c4bfd 100644
|
||||||
|
--- a/drivers/char/random.c
|
||||||
|
+++ b/drivers/char/random.c
|
||||||
|
@@ -831,10 +831,6 @@ static void numa_crng_init(void)
|
||||||
|
static void numa_crng_init(void) {}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-/*
|
||||||
|
- * crng_fast_load() can be called by code in the interrupt service
|
||||||
|
- * path. So we can't afford to dilly-dally.
|
||||||
|
- */
|
||||||
|
static int crng_fast_load(const char *cp, size_t len)
|
||||||
|
{
|
||||||
|
unsigned long flags;
|
||||||
|
@@ -861,51 +857,6 @@ static int crng_fast_load(const char *cp, size_t len)
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
-/*
|
||||||
|
- * crng_slow_load() is called by add_device_randomness, which has two
|
||||||
|
- * attributes. (1) We can't trust the buffer passed to it is
|
||||||
|
- * guaranteed to be unpredictable (so it might not have any entropy at
|
||||||
|
- * all), and (2) it doesn't have the performance constraints of
|
||||||
|
- * crng_fast_load().
|
||||||
|
- *
|
||||||
|
- * So we do something more comprehensive which is guaranteed to touch
|
||||||
|
- * all of the primary_crng's state, and which uses a LFSR with a
|
||||||
|
- * period of 255 as part of the mixing algorithm. Finally, we do
|
||||||
|
- * *not* advance crng_init_cnt since buffer we may get may be something
|
||||||
|
- * like a fixed DMI table (for example), which might very well be
|
||||||
|
- * unique to the machine, but is otherwise unvarying.
|
||||||
|
- */
|
||||||
|
-static int crng_slow_load(const char *cp, size_t len)
|
||||||
|
-{
|
||||||
|
- unsigned long flags;
|
||||||
|
- static unsigned char lfsr = 1;
|
||||||
|
- unsigned char tmp;
|
||||||
|
- unsigned i, max = CHACHA20_KEY_SIZE;
|
||||||
|
- const char * src_buf = cp;
|
||||||
|
- char * dest_buf = (char *) &primary_crng.state[4];
|
||||||
|
-
|
||||||
|
- if (!spin_trylock_irqsave(&primary_crng.lock, flags))
|
||||||
|
- return 0;
|
||||||
|
- if (crng_init != 0) {
|
||||||
|
- spin_unlock_irqrestore(&primary_crng.lock, flags);
|
||||||
|
- return 0;
|
||||||
|
- }
|
||||||
|
- if (len > max)
|
||||||
|
- max = len;
|
||||||
|
-
|
||||||
|
- for (i = 0; i < max ; i++) {
|
||||||
|
- tmp = lfsr;
|
||||||
|
- lfsr >>= 1;
|
||||||
|
- if (tmp & 1)
|
||||||
|
- lfsr ^= 0xE1;
|
||||||
|
- tmp = dest_buf[i % CHACHA20_KEY_SIZE];
|
||||||
|
- dest_buf[i % CHACHA20_KEY_SIZE] ^= src_buf[i % len] ^ lfsr;
|
||||||
|
- lfsr += (tmp << 3) | (tmp >> 5);
|
||||||
|
- }
|
||||||
|
- spin_unlock_irqrestore(&primary_crng.lock, flags);
|
||||||
|
- return 1;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
static void crng_reseed(struct crng_state *crng, struct entropy_store *r)
|
||||||
|
{
|
||||||
|
unsigned long flags;
|
||||||
|
@@ -1089,8 +1040,10 @@ void add_device_randomness(const void *buf, unsigned int size)
|
||||||
|
unsigned long time = random_get_entropy() ^ jiffies;
|
||||||
|
unsigned long flags;
|
||||||
|
|
||||||
|
- if (!crng_ready() && size)
|
||||||
|
- crng_slow_load(buf, size);
|
||||||
|
+ if (!crng_ready()) {
|
||||||
|
+ crng_fast_load(buf, size);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
trace_add_device_randomness(size, _RET_IP_);
|
||||||
|
spin_lock_irqsave(&input_pool.lock, flags);
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
@ -0,0 +1,64 @@
|
|||||||
|
From 85c6e5097fd62b172e6b57ae3498bcfb43c9a0b7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jeremy Cline <jeremy@jcline.org>
|
||||||
|
Date: Wed, 2 May 2018 15:18:03 -0400
|
||||||
|
Subject: [PATCH 8/8] Revert "random: fix crng_ready() test"
|
||||||
|
|
||||||
|
This reverts commit cd8d7a5778a4abf76ee8fe8f1bfcf78976029f8d.
|
||||||
|
|
||||||
|
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
|
||||||
|
---
|
||||||
|
drivers/char/random.c | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/char/random.c b/drivers/char/random.c
|
||||||
|
index 42ed176c4bfd..0bb3d0cd7d2d 100644
|
||||||
|
--- a/drivers/char/random.c
|
||||||
|
+++ b/drivers/char/random.c
|
||||||
|
@@ -428,7 +428,7 @@ struct crng_state primary_crng = {
|
||||||
|
* its value (from 0->1->2).
|
||||||
|
*/
|
||||||
|
static int crng_init = 0;
|
||||||
|
-#define crng_ready() (likely(crng_init > 1))
|
||||||
|
+#define crng_ready() (likely(crng_init > 0))
|
||||||
|
static int crng_init_cnt = 0;
|
||||||
|
static unsigned long crng_global_init_time = 0;
|
||||||
|
#define CRNG_INIT_CNT_THRESH (2*CHACHA20_KEY_SIZE)
|
||||||
|
@@ -838,7 +838,7 @@ static int crng_fast_load(const char *cp, size_t len)
|
||||||
|
|
||||||
|
if (!spin_trylock_irqsave(&primary_crng.lock, flags))
|
||||||
|
return 0;
|
||||||
|
- if (crng_init != 0) {
|
||||||
|
+ if (crng_ready()) {
|
||||||
|
spin_unlock_irqrestore(&primary_crng.lock, flags);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -913,7 +913,7 @@ static void _extract_crng(struct crng_state *crng,
|
||||||
|
{
|
||||||
|
unsigned long v, flags;
|
||||||
|
|
||||||
|
- if (crng_ready() &&
|
||||||
|
+ if (crng_init > 1 &&
|
||||||
|
(time_after(crng_global_init_time, crng->init_time) ||
|
||||||
|
time_after(jiffies, crng->init_time + CRNG_RESEED_INTERVAL)))
|
||||||
|
crng_reseed(crng, crng == &primary_crng ? &input_pool : NULL);
|
||||||
|
@@ -1200,7 +1200,7 @@ void add_interrupt_randomness(int irq, int irq_flags)
|
||||||
|
fast_mix(fast_pool);
|
||||||
|
add_interrupt_bench(cycles);
|
||||||
|
|
||||||
|
- if (unlikely(crng_init == 0)) {
|
||||||
|
+ if (!crng_ready()) {
|
||||||
|
if ((fast_pool->count >= 64) &&
|
||||||
|
crng_fast_load((char *) fast_pool->pool,
|
||||||
|
sizeof(fast_pool->pool))) {
|
||||||
|
@@ -2269,7 +2269,7 @@ void add_hwgenerator_randomness(const char *buffer, size_t count,
|
||||||
|
{
|
||||||
|
struct entropy_store *poolp = &input_pool;
|
||||||
|
|
||||||
|
- if (unlikely(crng_init == 0)) {
|
||||||
|
+ if (!crng_ready()) {
|
||||||
|
crng_fast_load(buffer, count);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user