From: James Clarke <jrtc27@jrtc27.com>
Date: Tue, 17 Dec 2019 18:29:29 +0000 (+0000)
Subject: hurd: Make getrandom honour GRND_NONBLOCK
X-Git-Tag: glibc-2.31~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a45244ce127763872ff0b5743fb4ac8299ee9b28;p=thirdparty%2Fglibc.git

hurd: Make getrandom honour GRND_NONBLOCK

* 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>
---

diff --git a/sysdeps/mach/hurd/getrandom.c b/sysdeps/mach/hurd/getrandom.c
index 8bf42aa40d5..aac9c6f8c67 100644
--- a/sysdeps/mach/hurd/getrandom.c
+++ b/sysdeps/mach/hurd/getrandom.c
@@ -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;