]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
tools/nolibc: add getrandom()
authorThomas Weißschuh <thomas.weissschuh@linutronix.de>
Mon, 28 Apr 2025 12:40:06 +0000 (14:40 +0200)
committerThomas Weißschuh <linux@weissschuh.net>
Wed, 21 May 2025 13:32:04 +0000 (15:32 +0200)
This is used in various selftests and will be handy when integrating
those with nolibc.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250428-nolibc-misc-v2-5-3c043eeab06c@linutronix.de
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
tools/include/nolibc/Makefile
tools/include/nolibc/nolibc.h
tools/include/nolibc/sys/random.h [new file with mode: 0644]
tools/testing/selftests/nolibc/nolibc-test.c

index dda881d934d6aeca3a1414ccefaa52cfa811bfae..45beeecad52dc7d51732aaa957ac6b58a9c7ffa6 100644 (file)
@@ -48,6 +48,7 @@ all_files := \
                sys.h \
                sys/auxv.h \
                sys/mman.h \
+               sys/random.h \
                sys/stat.h \
                sys/syscall.h \
                sys/time.h \
index 05a4bd5fba8bab9b6f896e617f73c49e30a1242e..1d2f391ca4d0e78fe6087653aa6f68a1310afd93 100644 (file)
@@ -98,6 +98,7 @@
 #include "sys.h"
 #include "sys/auxv.h"
 #include "sys/mman.h"
+#include "sys/random.h"
 #include "sys/stat.h"
 #include "sys/syscall.h"
 #include "sys/time.h"
diff --git a/tools/include/nolibc/sys/random.h b/tools/include/nolibc/sys/random.h
new file mode 100644 (file)
index 0000000..8d9749f
--- /dev/null
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
+/*
+ * random definitions for NOLIBC
+ * Copyright (C) 2025 Thomas Weißschuh <thomas.weissschuh@linutronix.de>
+ */
+
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
+#ifndef _NOLIBC_SYS_RANDOM_H
+#define _NOLIBC_SYS_RANDOM_H
+
+#include "../arch.h"
+#include "../sys.h"
+
+#include <linux/random.h>
+
+/*
+ * ssize_t getrandom(void *buf, size_t buflen, unsigned int flags);
+ */
+
+static __attribute__((unused))
+ssize_t sys_getrandom(void *buf, size_t buflen, unsigned int flags)
+{
+       return my_syscall3(__NR_getrandom, buf, buflen, flags);
+}
+
+static __attribute__((unused))
+ssize_t getrandom(void *buf, size_t buflen, unsigned int flags)
+{
+       return __sysret(sys_getrandom(buf, buflen, flags));
+}
+
+#endif /* _NOLIBC_SYS_RANDOM_H */
index abe0ae794208762f6d91ad81e902fbf77253a1c1..df1cb3e62564f1fa78c55740f7c2403b8390168f 100644 (file)
@@ -20,6 +20,7 @@
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
+#include <sys/random.h>
 #include <sys/reboot.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
@@ -807,6 +808,26 @@ static int test_dirent(void)
        return 0;
 }
 
+int test_getrandom(void)
+{
+       uint64_t rng = 0;
+       ssize_t ret;
+
+       ret = getrandom(&rng, sizeof(rng), GRND_NONBLOCK);
+       if (ret == -1 && errno == EAGAIN)
+               return 0; /* No entropy available yet */
+
+       if (ret != sizeof(rng))
+               return ret;
+
+       if (!rng) {
+               errno = EINVAL;
+               return -1;
+       }
+
+       return 0;
+}
+
 int test_getpagesize(void)
 {
        int x = getpagesize();
@@ -1124,6 +1145,7 @@ int run_syscall(int min, int max)
                CASE_TEST(getdents64_root);   EXPECT_SYSNE(1, test_getdents64("/"), -1); break;
                CASE_TEST(getdents64_null);   EXPECT_SYSER(1, test_getdents64("/dev/null"), -1, ENOTDIR); break;
                CASE_TEST(directories);       EXPECT_SYSZR(proc, test_dirent()); break;
+               CASE_TEST(getrandom);         EXPECT_SYSZR(1, test_getrandom()); break;
                CASE_TEST(gettimeofday_tv);   EXPECT_SYSZR(1, gettimeofday(&tv, NULL)); break;
                CASE_TEST(gettimeofday_tv_tz);EXPECT_SYSZR(1, gettimeofday(&tv, &tz)); break;
                CASE_TEST(getpagesize);       EXPECT_SYSZR(1, test_getpagesize()); break;