From: Matt Mackall <mpm@selenic.com>
To: Andrew Morton <akpm@osdl.org>, "Theodore Ts'o" <tytso@mit.edu>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/10] random pt2: kill pool clearing
Date: Fri, 14 Jan 2005 18:49:06 -0600 [thread overview]
Message-ID: <3.563253706@selenic.com> (raw)
In-Reply-To: <2.563253706@selenic.com>
Remove pool clearing. We've only ever cleared one of three pools and
there's no good reason to do it. Instead just reset the entropy count.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Index: rnd/drivers/char/random.c
===================================================================
--- rnd.orig/drivers/char/random.c 2005-01-12 21:27:58.951649596 -0800
+++ rnd/drivers/char/random.c 2005-01-12 21:28:00.196490892 -0800
@@ -546,15 +546,6 @@
return 0;
}
-/* Clear the entropy pool and associated counters. */
-static void clear_entropy_store(struct entropy_store *r)
-{
- r->add_ptr = 0;
- r->entropy_count = 0;
- r->input_rotate = 0;
- memset(r->pool, 0, r->poolinfo.POOLBYTES);
-}
-
/*
* This function adds a byte into the entropy "pool". It does not
* update the entropy estimate. The caller should call
@@ -1531,9 +1522,6 @@
if (create_entropy_store(SECONDARY_POOL_SIZE, "urandom",
&urandom_state))
goto err;
- clear_entropy_store(random_state);
- clear_entropy_store(sec_random_state);
- clear_entropy_store(urandom_state);
init_std_data(random_state);
init_std_data(sec_random_state);
init_std_data(urandom_state);
@@ -1765,10 +1753,10 @@
random_state->entropy_count = 0;
return 0;
case RNDCLEARPOOL:
- /* Clear the entropy pool and associated counters. */
+ /* Clear the entropy pool counters. */
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
- clear_entropy_store(random_state);
+ random_state->entropy_count = 0;
init_std_data(random_state);
return 0;
default:
next prev parent reply other threads:[~2005-01-15 0:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-15 0:49 [PATCH 1/10] random pt2: cleanup waitqueue logic, fix missed wakeup Matt Mackall
2005-01-15 0:49 ` Matt Mackall [this message]
2005-01-15 0:49 ` [PATCH 3/10] random pt2: combine legacy ioctls Matt Mackall
2005-01-15 0:49 ` [PATCH 4/10] random pt2: re-init all pools on zero Matt Mackall
2005-01-15 0:49 ` [PATCH 5/10] random pt2: simplify initialization Matt Mackall
2005-01-15 0:49 ` [PATCH 6/10] random pt2: kill memsets of static data Matt Mackall
2005-01-15 0:49 ` [PATCH 7/10] random pt2: kill dead extract_state struct Matt Mackall
2005-01-15 0:49 ` [PATCH 8/10] random pt2: kill 2.2 compat waitqueue defs Matt Mackall
2005-01-15 0:49 ` [PATCH 9/10] random pt2: kill redundant rotate_left definitions Matt Mackall
2005-01-15 0:49 ` [PATCH 10/10] random pt2: kill misnamed log2 Matt Mackall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3.563253706@selenic.com \
--to=mpm@selenic.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.