coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 05:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

libreboot-utils/lib: loop eintr on [p]read/[p]write

Browse Source 
i forgot to do this!

with this, I/O should be bullet proof now.
i already loop this on other I/O commands.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-29 14:15:34 +01:00
parent a56903a7b0
commit ac04a5f50a
3 changed files with 121 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/libreboot-utils/include/common.h
+8
View File
@@ -482,6 +482,14 @@ ssize_t rw_over_nrw(ssize_t r, size_t nrw);
off_t lseek_on_eintr(int fd, off_t off,
int whence, int loop_eagain, int loop_eintr);
int try_err(int loop_err, int errval);
ssize_t read_on_eintr(int fd,
void *buf, size_t count);
ssize_t write_on_eintr(int fd,
void *buf, size_t count);
ssize_t pread_on_eintr(int fd,
void *buf, size_t count, off_t off);
ssize_t pwrite_on_eintr(int fd,
void *buf, size_t count, off_t off);
/* Error handling and cleanup
*/
util/libreboot-utils/lib/file.c
+111 -6
View File
@@ -323,15 +323,15 @@ try_rw_again:
real_pread_pwrite:
#endif
if (rw_type == IO_WRITE)
r = write(fd, mem, nrw);
r = write_on_eintr(fd, mem, nrw);
else if (rw_type == IO_READ)
r = read(fd, mem, nrw);
r = read_on_eintr(fd, mem, nrw);
#if defined(REAL_POS_IO) && \
REAL_POS_IO > 0
else if (rw_type == IO_PWRITE)
r = pwrite(fd, mem, nrw, off);
r = pwrite_on_eintr(fd, mem, nrw, off);
else if (rw_type == IO_PREAD)
r = pread(fd, mem, nrw, off);
r = pread_on_eintr(fd, mem, nrw, off);
#endif
if (r == -1 && (errno == try_err(loop_eintr, EINTR)
@@ -386,9 +386,9 @@ real_pread_pwrite:
}
if (rw_type == IO_PREAD)
r = read(fd, mem, nrw);
r = read_on_eintr(fd, mem, nrw);
else if (rw_type == IO_PWRITE)
r = write(fd, mem, nrw);
r = write_on_eintr(fd, mem, nrw);
if (rw_over_nrw(r, nrw) == -1)
break;
@@ -955,13 +955,118 @@ retry:
return rval;
}
ssize_t
read_on_eintr(int fd,
void *buf, size_t count)
{
int saved_errno = errno;
int rval;
if (if_err(buf == NULL, EFAULT) ||
if_err(fd < 0, EBADF) ||
if_err(count == 0, EINVAL))
goto err;
retry:
errno = 0;
if ((rval = read(fd, buf, count)) == -1 && (
errno == EINTR ||
errno == EAGAIN ||
errno == EWOULDBLOCK ||
errno == ETXTBSY))
goto retry;
errno = saved_errno;
return rval;
err:
return set_errno(saved_errno, EIO);
}
ssize_t
pread_on_eintr(int fd,
void *buf, size_t count,
off_t off)
{
int saved_errno = errno;
int rval;
if (if_err(buf == NULL, EFAULT) ||
if_err(fd < 0, EBADF) ||
if_err(off < 0, EFAULT) ||
if_err(count == 0, EINVAL))
goto err;
retry:
errno = 0;
if ((rval = pread(fd, buf, count, off)) == -1 && (
errno == EINTR ||
errno == EAGAIN ||
errno == EWOULDBLOCK ||
errno == ETXTBSY))
goto retry;
errno = saved_errno;
return rval;
err:
return set_errno(saved_errno, EIO);
}
ssize_t
write_on_eintr(int fd,
void *buf, size_t count)
{
int saved_errno = errno;
int rval;
if (if_err(buf == NULL, EFAULT) ||
if_err(fd < 0, EBADF) ||
if_err(count == 0, EINVAL))
goto err;
retry:
errno = 0;
if ((rval = write(fd, buf, count)) == -1 && (
errno == EINTR ||
errno == EAGAIN ||
errno == EWOULDBLOCK ||
errno == ETXTBSY))
goto retry;
errno = saved_errno;
return rval;
err:
return set_errno(saved_errno, EIO);
}
ssize_t
pwrite_on_eintr(int fd,
void *buf, size_t count,
off_t off)
{
int saved_errno = errno;
int rval;
if (if_err(buf == NULL, EFAULT) ||
if_err(fd < 0, EBADF) ||
if_err(off < 0, EFAULT) ||
if_err(count == 0, EINVAL))
goto err;
retry:
errno = 0;
if ((rval = pwrite(fd, buf, count, off)) == -1 && (
errno == EINTR ||
errno == EAGAIN ||
errno == EWOULDBLOCK ||
errno == ETXTBSY))
goto retry;
errno = saved_errno;
return rval;
err:
return set_errno(saved_errno, EIO);
}
util/libreboot-utils/lib/rand.c
+2 -1
View File
@@ -150,7 +150,8 @@ rset(void *buf, size_t n)
int fd = -1;
open_on_eintr("/dev/urandom", &fd, O_RDONLY, 0400, NULL);
retry_rand:
if ((rc = read(fd, (unsigned char *)buf + off, n - off)) < 0) {
if ((rc = read_on_eintr(fd,
(unsigned char *)buf + off, n - off)) < 0) {
#elif defined(__linux__)
retry_rand:
if ((rc = (ssize_t)syscall(SYS_getrandom,