Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cff85031 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

random: only update the last_pulled time if we actually transferred entropy 



In xfer_secondary_pull(), check to make sure we need to pull from the
secondary pool before checking and potentially updating the
last_pulled time.

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: George Spelvin <linux@horizon.com>
parent 85608f8e

drivers/char/random.c

+7 −4
Original line number Diff line number Diff line
@@ -920,6 +920,11 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf, 
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;



	if (r->limit == 0 && random_min_urandom_seed) {

		unsigned long now = jiffies;
@@ -928,9 +933,7 @@ static void xfer_secondary_pool(struct entropy_store *r, size_t nbytes) 
			return;

		r->last_pulled = now;

	}

	if (r->pull &&

	    r->entropy_count < (nbytes << (ENTROPY_SHIFT + 3)) &&

	    r->entropy_count < r->poolinfo->poolfracbits)



	_xfer_secondary_pool(r, nbytes);

}