coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-16 23:08:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: use O_NONBLOCK on /dev/[u]random

Browse Source 
on some systems, it is otherwise blocking, but blocking
can be disabled, making access more reliable.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-10 14:25:43 +00:00
parent c953228bb0
commit 4bc7ba1e4b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+10 -2
View File
@@ -101,6 +101,10 @@ typedef char static_assert_off_t_is_32[(sizeof(off_t) >= 4) ? 1 : -1];
#define O_BINARY 0 #define O_BINARY 0
#endif #endif
#ifndef O_NONBLOCK
#define O_NONBLOCK 0
#endif
/* /*
* Sanitize command tables. * Sanitize command tables.
*/ */
@@ -708,11 +712,15 @@ static void
open_dev_urandom(void) open_dev_urandom(void)
{ {
rname = newrandom; rname = newrandom;
if ((urandom_fd = open(rname, O_RDONLY | O_BINARY)) != -1) urandom_fd = open(rname, O_RDONLY | O_BINARY | O_NONBLOCK);
if (urandom_fd != -1)
return; return;
/* /*
* Fall back to /dev/random on very old Unix. * Fall back to /dev/random on very old Unix.
*
* We must reset errno, to remove stale state
* set by reading /dev/urandom
*/ */
fprintf(stderr, "Can't open %s (will use %s instead)\n", fprintf(stderr, "Can't open %s (will use %s instead)\n",
@@ -721,7 +729,7 @@ open_dev_urandom(void)
errno = 0; errno = 0;
rname = oldrandom; rname = oldrandom;
xopen(&urandom_fd, rname, O_RDONLY | O_BINARY, &gbe_st); xopen(&urandom_fd, rname, O_RDONLY | O_BINARY | O_NONBLOCK, &gbe_st);
} }
static void static void