diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-18 05:42:37 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-18 05:42:37 +0000 |
commit | 47f0a8f9d04cf1434a22dbfce04b05f1f546468f (patch) | |
tree | 9047c01efaecc39bf6c55bc71a9e446b6f3f6940 /random.c | |
parent | a4c6ad1d1978f1b6007fbe5b0cc5b1abaee67d1a (diff) | |
download | ruby-47f0a8f9d04cf1434a22dbfce04b05f1f546468f.tar.gz |
* random.c (fill_random_bytes_syscall): don't use GRND_NONBLOCK.
It is meaningless. If SYS_getrandom(GRND_NONBLOCK) return
EAGAIN, we eventually call fill_random_bytes_urandom() and
it block such as SYS_getrandom() without GRND_NONBLOCK.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'random.c')
-rw-r--r-- | random.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -518,10 +518,6 @@ fill_random_bytes_syscall(void *seed, size_t size) #elif defined __linux__ && defined SYS_getrandom #include <linux/random.h> -# ifndef GRND_NONBLOCK -# define GRND_NONBLOCK 0x0001 /* not defined in musl libc */ -# endif - static int fill_random_bytes_syscall(void *seed, size_t size) { @@ -529,7 +525,7 @@ fill_random_bytes_syscall(void *seed, size_t size) if (try_syscall) { long ret; errno = 0; - ret = syscall(SYS_getrandom, seed, size, GRND_NONBLOCK); + ret = syscall(SYS_getrandom, seed, size, 0); if (errno == ENOSYS) { ATOMIC_SET(try_syscall, 0); return -1; |