mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 05:55:44 +02:00
random: wake up /dev/random writers after zap
[ Upstream commit 042e293e16 ]
When account() is called, and the amount of entropy dips below
random_write_wakeup_bits, we wake up the random writers, so that they
can write some more in. However, the RNDZAPENTCNT/RNDCLEARPOOL ioctl
sets the entropy count to zero -- a potential reduction just like
account() -- but does not unblock writers. This commit adds the missing
logic to that ioctl to unblock waiting writers.
Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
143aaf79ba
commit
45102b538a
|
|
@ -1987,7 +1987,10 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
|
||||||
*/
|
*/
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
input_pool.entropy_count = 0;
|
if (xchg(&input_pool.entropy_count, 0) && random_write_wakeup_bits) {
|
||||||
|
wake_up_interruptible(&random_write_wait);
|
||||||
|
kill_fasync(&fasync, SIGIO, POLL_OUT);
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
case RNDRESEEDCRNG:
|
case RNDRESEEDCRNG:
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user