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

Commit befd00cf authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Greg Kroah-Hartman
Browse files

random: crng_reseed() should lock the crng instance that it is modifying 



commit 0bb29a849a6433b72e249eea7695477b02056e94 upstream.

Reported-by: default avatarJann Horn <jannh@google.com>
Fixes: 1e7f583a ("random: make /dev/urandom scalable for silly...")
Cc: stable@kernel.org # 4.8+
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJann Horn <jannh@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4dfb3442

drivers/char/random.c

+2 −2
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ static void crng_reseed(struct crng_state *crng, struct entropy_store *r) 
		_crng_backtrack_protect(&primary_crng, buf.block,

					CHACHA20_KEY_SIZE);

	}

	spin_lock_irqsave(&primary_crng.lock, flags);

	spin_lock_irqsave(&crng->lock, flags);

	for (i = 0; i < 8; i++) {

		unsigned long	rv;

		if (!arch_get_random_seed_long(&rv) &&
@@ -852,7 +852,7 @@ static void crng_reseed(struct crng_state *crng, struct entropy_store *r) 
		wake_up_interruptible(&crng_init_wait);

		pr_notice("random: crng init done\n");

	}

	spin_unlock_irqrestore(&primary_crng.lock, flags);

	spin_unlock_irqrestore(&crng->lock, flags);

}



static inline void maybe_reseed_primary_crng(void)