summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--random.c6
2 files changed, 5 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a878806..c63cbdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,13 +3,6 @@ Sun Oct 18 14:37:56 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* random.c (fill_random_bytes_urandom): add a comment why using
O_NONBLOCK and O_NOCTTY.
-Sun Oct 18 13:30:56 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * 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.
-
Sun Oct 18 13:24:17 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* random.c (fill_random_bytes_syscall): use ATOMIC_SET() for
diff --git a/random.c b/random.c
index e73e3de..d8b3c72 100644
--- a/random.c
+++ b/random.c
@@ -523,6 +523,10 @@ 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)
{
@@ -530,7 +534,7 @@ fill_random_bytes_syscall(void *seed, size_t size)
if (try_syscall) {
long ret;
errno = 0;
- ret = syscall(SYS_getrandom, seed, size, 0);
+ ret = syscall(SYS_getrandom, seed, size, GRND_NONBLOCK);
if (errno == ENOSYS) {
ATOMIC_SET(try_syscall, 0);
return -1;