]> git.itanic.dy.fi Git - linux-stable/commit
random: restore O_NONBLOCK support
authorJason A. Donenfeld <Jason@zx2c4.com>
Thu, 8 Sep 2022 14:14:00 +0000 (16:14 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Fri, 23 Sep 2022 10:27:57 +0000 (12:27 +0200)
commitcd4f24ae9404fd31fc461066e57889be3b68641b
treeb6b6655935101c5924b00a7504cadcb47f3040b0
parent504c25cb76a9cb805407f7701b25a1fbd48605fa
random: restore O_NONBLOCK support

Prior to 5.6, when /dev/random was opened with O_NONBLOCK, it would
return -EAGAIN if there was no entropy. When the pools were unified in
5.6, this was lost. The post 5.6 behavior of blocking until the pool is
initialized, and ignoring O_NONBLOCK in the process, went unnoticed,
with no reports about the regression received for two and a half years.
However, eventually this indeed did break somebody's userspace.

So we restore the old behavior, by returning -EAGAIN if the pool is not
initialized. Unlike the old /dev/random, this can only occur during
early boot, after which it never blocks again.

In order to make this O_NONBLOCK behavior consistent with other
expectations, also respect users reading with preadv2(RWF_NOWAIT) and
similar.

Fixes: 30c08efec888 ("random: make /dev/random be almost like /dev/urandom")
Reported-by: Guozihua <guozihua@huawei.com>
Reported-by: Zhongguohua <zhongguohua1@huawei.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Andrew Lutomirski <luto@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
drivers/char/mem.c
drivers/char/random.c