hurd: Make getrandom honour GRND_NONBLOCK
authorJames Clarke <jrtc27@jrtc27.com>
Tue, 17 Dec 2019 18:29:29 +0000 (18:29 +0000)
committerSamuel Thibault <samuel.thibault@ens-lyon.org>
Tue, 17 Dec 2019 19:38:01 +0000 (20:38 +0100)
* sysdeps/mach/hurd/getrandom.c (__getrandom): Open the random source
with O_NONBLOCK when the GRND_NONBLOCK flag is provided.
Message-Id: <20191217182929.90989-1-jrtc27@jrtc27.com>

sysdeps/mach/hurd/getrandom.c

index 8bf42aa..aac9c6f 100644 (file)
@@ -27,13 +27,17 @@ ssize_t
 __getrandom (void *buffer, size_t length, unsigned int flags)
 {
   const char *random_source = "/dev/urandom";
+  int open_flags = O_RDONLY | O_CLOEXEC;
   size_t amount_read;
   int fd;
 
   if (flags & GRND_RANDOM)
     random_source = "/dev/random";
 
-  fd = __open_nocancel(random_source, O_RDONLY | O_CLOEXEC);
+  if (flags & GRND_NONBLOCK)
+    open_flags |= O_NONBLOCK;
+
+  fd = __open_nocancel(random_source, open_flags);
   if (fd == -1)
     return -1;