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

util/nvmutil: fix EINTR detection on urandom read

Browse Source 
i forgot to handle it in the previous refactor

not really a problem in practise, since the first
read probably succeeds anyway.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-09 21:02:33 +00:00
parent c59b3b7638
commit f8ddb6ef84
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+11 -4
View File
@@ -992,10 +992,17 @@ read_dev_urandom(int fd, void *buf, size_t len)
for (retry = 0; retry < MAX_RETRY_RW; retry++) { for (retry = 0; retry < MAX_RETRY_RW; retry++) {
rval = read(fd, buf, len); rval = read(fd, buf, len);
if (rval && (size_t)rval <= len) { if (rval == -1) {
errno = 0; if (errno == EINTR)
return rval; continue;
err(errno, "%s", rname);
} }
if (!rval || (size_t)rval > len)
continue;
errno = 0;
return rval;
} }
err(EINTR, "%s: read: max retries exceeded: %s", rname); err(EINTR, "%s: read: max retries exceeded: %s", rname);
@@ -1228,7 +1235,7 @@ write_gbe_file_part(size_t p)
if (rval != -1) if (rval != -1)
err(ECANCELED, err(ECANCELED,
"%s: Short pwrite, %zd bytes", "%s: Short pwrite of %zd bytes",
fname, rval); fname, rval);
if (errno != EINTR) if (errno != EINTR)