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

Commit c4edc105 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Greg Kroah-Hartman
Browse files

random: ignore GRND_RANDOM in getentropy(2) 



commit 48446f198f9adcb499b30332488dfd5bc3f176f6 upstream.

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: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/705c5a091b63cc5da70c99304bb97e0109be0a26.1577088521.git.luto@kernel.org


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f9f864a

drivers/char/random.c

+0 −3
Original line number Diff line number Diff line
@@ -2230,9 +2230,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;

include/uapi/linux/random.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct rand_pool_info { 
 * Flags for getrandom(2)

 *

 * GRND_NONBLOCK	Don't block and return EAGAIN instead

 * GRND_RANDOM		Use the /dev/random pool instead of /dev/urandom

 * GRND_RANDOM		No effect

 * GRND_INSECURE	Return non-cryptographic random bytes

 */

#define GRND_NONBLOCK	0x0001