This is a note to let you know that I've just added the patch titled
random: delete code to pull data into pools
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
random-delete-code-to-pull-data-into-pools.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Fri Jun 17 08:58:56 AM CEST 2022
From: Andy Lutomirski <luto@xxxxxxxxxx>
Date: Mon, 23 Dec 2019 00:20:50 -0800
Subject: random: delete code to pull data into pools
From: Andy Lutomirski <luto@xxxxxxxxxx>
commit 84df7cdfbb215a34657b39f4257dab739efa2df9 upstream.
There is no pool that pulls, so it was just dead code.
Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxx>
Link: https://lore.kernel.org/r/4a05fe0c7a5c831389ef4aea51d24528ac8682c7.1577088521.git.luto@xxxxxxxxxx
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: Jason A. Donenfeld <Jason@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/char/random.c | 40 ----------------------------------------
1 file changed, 40 deletions(-)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -530,10 +530,8 @@ struct entropy_store {
const struct poolinfo *poolinfo;
__u32 *pool;
const char *name;
- struct entropy_store *pull;
/* read-write data: */
- unsigned long last_pulled;
spinlock_t lock;
unsigned short add_ptr;
unsigned short input_rotate;
@@ -1367,41 +1365,6 @@ EXPORT_SYMBOL_GPL(add_disk_randomness);
*********************************************************************/
/*
- * This utility inline function is responsible for transferring entropy
- * from the primary pool to the secondary extraction pool. We make
- * sure we pull enough for a 'catastrophic reseed'.
- */
-static void _xfer_secondary_pool(struct entropy_store *r, size_t nbytes);
-static void xfer_secondary_pool(struct entropy_store *r, size_t nbytes)
-{
- if (!r->pull ||
- r->entropy_count >= (nbytes << (ENTROPY_SHIFT + 3)) ||
- r->entropy_count > r->poolinfo->poolfracbits)
- return;
-
- _xfer_secondary_pool(r, nbytes);
-}
-
-static void _xfer_secondary_pool(struct entropy_store *r, size_t nbytes)
-{
- __u32 tmp[OUTPUT_POOL_WORDS];
-
- int bytes = nbytes;
-
- /* pull at least as much as a wakeup */
- bytes = max_t(int, bytes, random_read_wakeup_bits / 8);
- /* but never more than the buffer size */
- bytes = min_t(int, bytes, sizeof(tmp));
-
- trace_xfer_secondary_pool(r->name, bytes * 8, nbytes * 8,
- ENTROPY_BITS(r), ENTROPY_BITS(r->pull));
- bytes = extract_entropy(r->pull, tmp, bytes,
- random_read_wakeup_bits / 8, 0);
- mix_pool_bytes(r, tmp, bytes);
- credit_entropy_bits(r, bytes*8);
-}
-
-/*
* This function decides how many bytes to actually take from the
* given pool, and also debits the entropy count accordingly.
*/
@@ -1564,7 +1527,6 @@ static ssize_t extract_entropy(struct en
spin_unlock_irqrestore(&r->lock, flags);
trace_extract_entropy(r->name, EXTRACT_SIZE,
ENTROPY_BITS(r), _RET_IP_);
- xfer_secondary_pool(r, EXTRACT_SIZE);
extract_buf(r, tmp);
spin_lock_irqsave(&r->lock, flags);
memcpy(r->last_data, tmp, EXTRACT_SIZE);
@@ -1573,7 +1535,6 @@ static ssize_t extract_entropy(struct en
}
trace_extract_entropy(r->name, nbytes, ENTROPY_BITS(r), _RET_IP_);
- xfer_secondary_pool(r, nbytes);
nbytes = account(r, nbytes, min, reserved);
return _extract_entropy(r, buf, nbytes, fips_enabled);
@@ -1845,7 +1806,6 @@ static void __init init_std_data(struct
ktime_t now = ktime_get_real();
unsigned long rv;
- r->last_pulled = jiffies;
mix_pool_bytes(r, &now, sizeof(now));
for (i = r->poolinfo->poolbytes; i > 0; i -= sizeof(rv)) {
if (!arch_get_random_seed_long(&rv) &&
Patches currently in stable-queue which might be from luto@xxxxxxxxxx are
queue-4.19/random-remove-kernel.random.read_wakeup_threshold.patch
queue-4.19/random-initialize-chacha20-constants-with-correct-endianness.patch
queue-4.19/random-make-dev-random-be-almost-like-dev-urandom.patch
queue-4.19/random-remove-batched-entropy-locking.patch
queue-4.19/random-remove-the-blocking-pool.patch
queue-4.19/random-ignore-grnd_random-in-getentropy-2.patch
queue-4.19/random-delete-code-to-pull-data-into-pools.patch
queue-4.19/random-don-t-wake-crng_init_wait-when-crng_init-1.patch
queue-4.19/random-add-a-urandom_read_nowait-for-random-apis-that-don-t-warn.patch
queue-4.19/random-remove-dead-code-left-over-from-blocking-pool.patch
queue-4.19/random-add-grnd_insecure-to-return-best-effort-non-cryptographic-bytes.patch
