random: wake up /dev/random writers after zap
Jason A. Donenfeld
maintainerPATCH 1/1 random: wake up /dev/random writers after zap
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.
--- drivers/char/random.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/char/random.c +4 -1
@@ -1856,7 +1856,10 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)*/ if (!capable (CAP_SYS_ADMIN ))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 ;case RNDRESEEDCRNG :if (!capable (CAP_SYS_ADMIN ))
Signature · 1 line
2.35.0
Am Fri, Jan 28, 2022 at 11:49:06PM +0100 schrieb Jason A. Donenfeld:
Quoted 9 lines
When
account()is called, and the amount of entropy dips belowrandom_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 likeaccount()-- but does not unblock writers. This commit adds the missing logic to that ioctl to unblock waiting writers.Cc Dominik Brodowski <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Thanks,
Dominik