From df97dfb0a66d4499d477ab8e824f51c787262b12 Mon Sep 17 00:00:00 2001 From: Matt Mackall Date: Thu, 19 Jul 2007 11:30:14 -0700 Subject: [PATCH] --- yaml --- r: 61775 b: refs/heads/master c: 5a021e9ffd56c22700133ebc37d607f95be8f7bd h: refs/heads/master i: 61773: b24bf6c24338987b2b03d2ff114737561afc090d 61771: 4f35dd70fada49baa358372a4dfe907cd472f6fb 61767: ce25915343b1e66593ff69d1f27ecbec70c83ee8 61759: 65300125f500883d507f50c9c7e64bb9033562b2 v: v3 --- [refs] | 2 +- trunk/drivers/char/random.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34284fec9e61..d573b2c1f436 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f745bb1c73e2395e6b9961d4d915a8f8e2cd32cd +refs/heads/master: 5a021e9ffd56c22700133ebc37d607f95be8f7bd diff --git a/trunk/drivers/char/random.c b/trunk/drivers/char/random.c index 7f5271272f91..397c714cf2ba 100644 --- a/trunk/drivers/char/random.c +++ b/trunk/drivers/char/random.c @@ -693,9 +693,14 @@ static void xfer_secondary_pool(struct entropy_store *r, size_t nbytes) if (r->pull && r->entropy_count < nbytes * 8 && r->entropy_count < r->poolinfo->POOLBITS) { - int bytes = max_t(int, random_read_wakeup_thresh / 8, - min_t(int, nbytes, sizeof(tmp))); + /* If we're limited, always leave two wakeup worth's BITS */ int rsvd = r->limit ? 0 : random_read_wakeup_thresh/4; + int bytes = nbytes; + + /* pull at least as many as BYTES as wakeup BITS */ + bytes = max_t(int, bytes, random_read_wakeup_thresh / 8); + /* but never more than the buffer size */ + bytes = min_t(int, bytes, sizeof(tmp)); DEBUG_ENT("going to reseed %s with %d bits " "(%d of %d requested)\n",