Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use raw system call of getrandom for glibc version before 2.25 #482

Merged
merged 2 commits into from
Apr 9, 2023
Merged

use raw system call of getrandom for glibc version before 2.25 #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5055857
Update eio_stubs.c
zenfey Apr 5, 2023
c1f47f8
raw system call of getrandom for glibc<2.25
zenfey Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib_eio_linux/eio_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/eventfd.h>
#if __GLIBC__ > 2 || __GLIBC_MINOR__ > 24
#include <sys/random.h>
#endif
#include <sys/syscall.h>
#include <limits.h>
#include <errno.h>
Expand Down Expand Up @@ -97,7 +99,11 @@ CAMLprim value caml_eio_getrandom(value v_ba, value v_off, value v_len) {
do {
void *buf = Caml_ba_data_val(v_ba) + off;
caml_enter_blocking_section();
#if __GLIBC__ > 2 || __GLIBC_MINOR__ > 24
ret = getrandom(buf, len, 0);
#else
ret = syscall(SYS_getrandom, buf, len, 0);
#endif
caml_leave_blocking_section();
} while (ret == -1 && errno == EINTR);
if (ret == -1) uerror("getrandom", Nothing);
Expand Down
8 changes: 8 additions & 0 deletions lib_eio_posix/eio_posix_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

#include <sys/types.h>
#ifdef __linux__
#if __GLIBC__ > 2 || __GLIBC_MINOR__ > 24
#include <sys/random.h>
#else
#include <sys/syscall.h>
#endif
#endif
#include <sys/uio.h>
#include <sys/stat.h>
Expand Down Expand Up @@ -40,7 +44,11 @@ CAMLprim value caml_eio_posix_getrandom(value v_ba, value v_off, value v_len) {
void *buf = (uint8_t *)Caml_ba_data_val(v_ba) + off;
caml_enter_blocking_section();
#ifdef __linux__
#if __GLIBC__ > 2 || __GLIBC_MINOR__ > 24
ret = getrandom(buf, len, 0);
#else
ret = syscall(SYS_getrandom, buf, len, 0);
#endif
#else
arc4random_buf(buf, len);
ret = len;
Expand Down