Using getrandom() libc interface.

Available since Glibc 2.25, and FreeBSD 12.0.

diff --git a/nxt/auto/getrandom b/nxt/auto/getrandom
index 00e85daf47dcaca19deaee1f6f6950bed08c2c13..e3fbc5983fafc2f3a4329be528c2891e1c794cf4 100644 (file)
--- a/nxt/auto/getrandom
+++ b/nxt/auto/getrandom
@@ -3,22 +3,45 @@
 # Copyright (C) NGINX, Inc.
 
 
-# Linux 3.17 getrandom().
+# getrandom().
 
 nxt_feature="getrandom()"
 nxt_feature_name=NXT_HAVE_GETRANDOM
-nxt_feature_run=no
+nxt_feature_run=yes
 nxt_feature_incs=
 nxt_feature_libs=
 nxt_feature_test="#include <unistd.h>
-                  #include <sys/syscall.h>
-                  #include <linux/random.h>
+                  #include <sys/random.h>
 
                   int main(void) {
                       char  buf[4];
 
-                      (void) syscall(SYS_getrandom, buf, 4, 0);
+                      if (getrandom(buf, 4, 0) < 0) {
+                          return 1;
+                      }
 
                       return 0;
                   }"
 . ${NXT_AUTO}feature
+
+if [ $nxt_found = no ]; then
+
+    # Linux 3.17 SYS_getrandom.
+
+    nxt_feature="SYS_getrandom in Linux"
+    nxt_feature_name=NXT_HAVE_LINUX_SYS_GETRANDOM
+    nxt_feature_test="#include <unistd.h>
+                      #include <sys/syscall.h>
+                      #include <linux/random.h>
+
+                      int main(void) {
+                          char  buf[4];
+
+                          if (syscall(SYS_getrandom, buf, 4, 0) < 0) {
+                              return 1;
+                          }
+
+                          return 0;
+                      }"
+    . ${NXT_AUTO}feature
+fi

diff --git a/nxt/nxt_random.c b/nxt/nxt_random.c
index d9a8c03c51fa7407160161dce8e2fd771c1404b5..f99dee0894237f9c437433b9c349073793d19e93 100644 (file)
--- a/nxt/nxt_random.c
+++ b/nxt/nxt_random.c
@@ -13,6 +13,8 @@
 #include <sys/time.h>
 #include <unistd.h>
 #if (NXT_HAVE_GETRANDOM)
+#include <sys/random.h>
+#elif (NXT_HAVE_LINUX_SYS_GETRANDOM)
 #include <sys/syscall.h>
 #include <linux/random.h>
 #endif
@@ -66,7 +68,11 @@ nxt_random_stir(nxt_random_t *r, nxt_pid_t pid)
 
 #if (NXT_HAVE_GETRANDOM)
 
-    /* Linux 3.17 getrandom(), it is not available in Glibc. */
+    n = getrandom(&key, NXT_RANDOM_KEY_SIZE, 0);
+
+#elif (NXT_HAVE_LINUX_SYS_GETRANDOM)
+
+    /* Linux 3.17 SYS_getrandom, not available in Glibc prior to 2.25. */
 
     n = syscall(SYS_getrandom, &key, NXT_RANDOM_KEY_SIZE, 0);