Commit cf833d0b authored by Linus Torvalds's avatar Linus Torvalds Committed by H. Peter Anvin

random: Use arch_get_random_int instead of cycle counter if avail

We still don't use rdrand in /dev/random, which just seems stupid. We
accept the *cycle*counter* as a random input, but we don't accept
rdrand? That's just broken.

Sure, people can do things in user space (write to /dev/random, use
rdrand in addition to /dev/random themselves etc etc), but that
*still* seems to be a particularly stupid reason for saying "we
shouldn't bother to try to do better in /dev/random".

And even if somebody really doesn't trust rdrand as a source of random
bytes, it seems singularly stupid to trust the cycle counter *more*.

So I'd suggest the attached patch. I'm not going to even bother
arguing that we should add more bits to the entropy estimate, because
that's not the point - I don't care if /dev/random fills up slowly or
not, I think it's just stupid to not use the bits we can get from
rdrand and mix them into the strong randomness pool.

Link: http://lkml.kernel.org/r/CA%2B55aFwn59N1=m651QAyTy-1gO1noGbK18zwKDwvwqnravA84A@mail.gmail.comAcked-by: default avatar"David S. Miller" <davem@davemloft.net>
Acked-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 5f0a6e2d
...@@ -624,8 +624,8 @@ static struct timer_rand_state input_timer_state; ...@@ -624,8 +624,8 @@ static struct timer_rand_state input_timer_state;
static void add_timer_randomness(struct timer_rand_state *state, unsigned num) static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
{ {
struct { struct {
cycles_t cycles;
long jiffies; long jiffies;
unsigned cycles;
unsigned num; unsigned num;
} sample; } sample;
long delta, delta2, delta3; long delta, delta2, delta3;
...@@ -637,7 +637,11 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) ...@@ -637,7 +637,11 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
goto out; goto out;
sample.jiffies = jiffies; sample.jiffies = jiffies;
sample.cycles = get_cycles();
/* Use arch random value, fall back to cycles */
if (!arch_get_random_int(&sample.cycles))
sample.cycles = get_cycles();
sample.num = num; sample.num = num;
mix_pool_bytes(&input_pool, &sample, sizeof(sample)); mix_pool_bytes(&input_pool, &sample, sizeof(sample));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment