| Message ID | 9955153.9pz8KSq437@positron.chronox.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
On Tue, Dec 27, 2016 at 11:41:46PM +0100, Stephan Müller wrote: > Since the introduction of the ChaCha20 DRNG, extract_entropy is only > invoked with the input_pool. For this entropy pool, xfer_secondary_pool > is a no-op and can therefore be safely removed. > > Signed-off-by: Stephan Mueller <smueller@chronox.de> Instead of doing some minor deletions of single lines, what I want to do is to look at a more comprehensive refactoring of the code. The fact that we have extract_entropy() only being used for the input pool, and extract_entropy_user() ony being used for the non-blocking pool, is not obvious from the function name and the arguments that these functions take. Either the functions should be kept general (so someone else using them in the future won't get confused about how they work), or they should be made more speceific. But doing light modifications like have the danger of causing confusion and bugs in the future. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/char/random.c b/drivers/char/random.c index 89d67c0..7b72a01 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1417,7 +1417,6 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf, } 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);
Since the introduction of the ChaCha20 DRNG, extract_entropy is only invoked with the input_pool. For this entropy pool, xfer_secondary_pool is a no-op and can therefore be safely removed. Signed-off-by: Stephan Mueller <smueller@chronox.de> --- drivers/char/random.c | 1 - 1 file changed, 1 deletion(-)