summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2019-12-23 00:20:47 -0800
committerTheodore Ts'o <tytso@mit.edu>2020-01-07 16:07:01 -0500
commit48446f198f9adcb499b30332488dfd5bc3f176f6 (patch)
treedf7b7957fd86702618f579ea4ccf02a9190803ca /drivers/char
parent75551dbf112c992bc6c99a972990b3f272247e23 (diff)
random: ignore GRND_RANDOM in getentropy(2)
The separate blocking pool is going away. Start by ignoring GRND_RANDOM in getentropy(2). This should not materially break any API. Any code that worked without this change should work at least as well with this change. Signed-off-by: Andy Lutomirski <luto@kernel.org> Link: https://lore.kernel.org/r/705c5a091b63cc5da70c99304bb97e0109be0a26.1577088521.git.luto@kernel.org Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/random.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index b7e2ad7eafca..a92dfea038ce 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -2207,9 +2207,6 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count,
if (count > INT_MAX)
count = INT_MAX;
- if (flags & GRND_RANDOM)
- return _random_read(flags & GRND_NONBLOCK, buf, count);
-
if (!(flags & GRND_INSECURE) && !crng_ready()) {
if (flags & GRND_NONBLOCK)
return -EAGAIN;