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

nvmutil: move increment logic to rw_file_exact

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-14 21:06:20 +00:00
parent 4a3951a4d9
commit c825d80198
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+12 -11
View File
@@ -406,7 +406,7 @@ static ssize_t rw_file_exact(int fd, u8 *mem, size_t len,
off_t off, int rw_type, int loop_eagain, int loop_eintr, off_t off, int rw_type, int loop_eagain, int loop_eintr,
size_t max_retries); size_t max_retries);
static ssize_t rw_file_once(int fd, u8 *mem, size_t len, static ssize_t rw_file_once(int fd, u8 *mem, size_t len,
off_t off, int rw_type, size_t rc, int loop_eagain, off_t off, int rw_type, int loop_eagain,
int loop_eintr, size_t max_retries); int loop_eintr, size_t max_retries);
static ssize_t prw(int fd, void *mem, size_t nrw, static ssize_t prw(int fd, void *mem, size_t nrw,
off_t off, int rw_type, int loop_eagain, int loop_eintr); off_t off, int rw_type, int loop_eagain, int loop_eintr);
@@ -1873,11 +1873,15 @@ rw_file_exact(int fd, u8 *mem, size_t nrw,
off_t off, int rw_type, int loop_eagain, off_t off, int rw_type, int loop_eagain,
int loop_eintr, size_t max_retries) int loop_eintr, size_t max_retries)
{ {
ssize_t rv; ssize_t rv = 0;
size_t rc; size_t rc = 0;
for (rc = 0, rv = 0; rc < nrw; ) { for (rc = 0, rv = 0; rc < nrw; ) {
if ((rv = rw_file_once(fd, mem, nrw, off, rw_type, rc,
rc += (size_t)rv;
if ((rv = rw_file_once(fd,
mem + rc, nrw - rc, off + rc, rw_type,
loop_eagain, loop_eintr, max_retries)) < 0) loop_eagain, loop_eintr, max_retries)) < 0)
return -1; return -1;
@@ -1893,8 +1897,6 @@ rw_file_exact(int fd, u8 *mem, size_t nrw,
/* Prevent theoretical overflow */ /* Prevent theoretical overflow */
if ((size_t)rv > nrw - rc) if ((size_t)rv > nrw - rc)
goto err_rw_file_exact; goto err_rw_file_exact;
rc += (size_t)rv;
} }
return rc; return rc;
@@ -1921,9 +1923,8 @@ err_rw_file_exact:
*/ */
static ssize_t static ssize_t
rw_file_once(int fd, u8 *mem, size_t nrw, rw_file_once(int fd, u8 *mem, size_t nrw,
off_t off, int rw_type, size_t rc, off_t off, int rw_type, int loop_eagain,
int loop_eagain, int loop_eintr, int loop_eintr, size_t max_retries)
size_t max_retries)
{ {
ssize_t rv; ssize_t rv;
size_t retries_on_zero = 0; size_t retries_on_zero = 0;
@@ -1932,13 +1933,13 @@ rw_file_once(int fd, u8 *mem, size_t nrw,
goto err_rw_file_once; goto err_rw_file_once;
read_again: read_again:
rv = prw(fd, mem + rc, nrw - rc, off + rc, rw_type, rv = prw(fd, mem, nrw, off, rw_type,
loop_eagain, loop_eintr); loop_eagain, loop_eintr);
if (rv < 0) if (rv < 0)
return -1; return -1;
if ((size_t)rv > (nrw - rc))/* don't overflow */ if ((size_t)rv > nrw)/* don't overflow */
goto err_rw_file_once; goto err_rw_file_once;
if (rv != 0) if (rv != 0)