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

util/nvmutil: split up rw_file_exact

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-12 16:00:04 +00:00
parent 48f124a2e8
commit 1fb720e1e6
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+29 -17
View File
@@ -215,6 +215,8 @@ static off_t gbe_x_offset(size_t part, const char *f_op,
const char *d_type, off_t nsize, off_t ncmp); const char *d_type, off_t nsize, off_t ncmp);
static ssize_t rw_file_exact(int fd, uint8_t *mem, size_t len, static ssize_t rw_file_exact(int fd, uint8_t *mem, size_t len,
off_t off, int rw_type); off_t off, int rw_type);
static ssize_t rw_file_once(int fd, uint8_t *mem, size_t len,
off_t off, int rw_type, size_t rc);
static ssize_t do_rw(int fd, static ssize_t do_rw(int fd,
uint8_t *mem, size_t len, off_t off, int rw_type); uint8_t *mem, size_t len, off_t off, int rw_type);
static ssize_t prw(int fd, void *mem, size_t nrw, static ssize_t prw(int fd, void *mem, size_t nrw,
@@ -1427,35 +1429,45 @@ static ssize_t
rw_file_exact(int fd, uint8_t *mem, size_t len, rw_file_exact(int fd, uint8_t *mem, size_t len,
off_t off, int rw_type) off_t off, int rw_type)
{ {
ssize_t rval = 0; ssize_t rv;
size_t rc = 0; size_t rc;
if (fd < 0 || !len || len > (size_t)SSIZE_MAX) { if (fd < 0 || !len || len > (size_t)SSIZE_MAX) {
errno = EIO; errno = EIO;
return -1; return -1;
} }
while (rc < len) { for (rc = 0, rv = 0; rc < len; rc += (size_t)rv) {
rval = do_rw(fd, mem + rc, len - rc, off + rc, rw_type); if ((rv = rw_file_once(fd, mem, len, off, rw_type, rc)) == -1)
if (rval < 0 && errno == EINTR) {
continue;
} else if (rval < 0) {
errno = EIO;
return -1; return -1;
}
if ((size_t)rval > (len - rc) /* Prevent overflow */
|| rval == 0) { /* Prevent infinite 0-byte loop */
errno = EIO;
return -1;
}
rc += (size_t)rval;
} }
return rc; return rc;
} }
static ssize_t
rw_file_once(int fd, uint8_t *mem, size_t len,
off_t off, int rw_type, size_t rc)
{
ssize_t rv;
read_again:
rv = do_rw(fd, mem + rc, len - rc, off + rc, rw_type);
if (rv < 0 && errno == EINTR) {
goto read_again;
} else if (rv < 0) {
errno = EIO;
return -1;
}
if ((size_t)rv > (len - rc) /* Prevent overflow */
|| rv == 0) { /* Prevent infinite 0-byte loop */
errno = EIO;
return -1;
}
return rv;
}
static ssize_t static ssize_t
do_rw(int fd, uint8_t *mem, do_rw(int fd, uint8_t *mem,
size_t len, off_t off, int rw_type) size_t len, off_t off, int rw_type)