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

util/nvmutil: reduced indentation in rw_file_once

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-13 03:12:51 +00:00
parent 172cbd4497
commit 5f6a721fa0
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+11 -9
View File
@@ -1592,7 +1592,6 @@ rw_file_once(int fd, uint8_t *mem, size_t len,
ssize_t rv; ssize_t rv;
size_t retries_on_zero = 0; size_t retries_on_zero = 0;
size_t max_retries = 10; size_t max_retries = 10;
read_again: read_again:
rv = do_rw(fd, mem + rc, len - rc, off + rc, rw_type); rv = do_rw(fd, mem + rc, len - rc, off + rc, rw_type);
@@ -1612,12 +1611,18 @@ read_again:
if ((size_t)rv > SSIZE_MAX) { if ((size_t)rv > SSIZE_MAX) {
errno = EIO; errno = EIO;
return -1; return -1;
/* we will not tolerate your buggy libc */ /* we do not tolerate buggy libc */
} }
if ((size_t)rv > (len - rc) /* Prevent overflow */ if (!((size_t)rv > (len - rc) /* don't overflow */
|| rv == 0) { /* Prevent infinite 0-byte loop */ || rv == 0))
if (rv == 0) { return rv;
/* Prevent infinite 0-byte loop */
if (rv != 0) {
errno = EIO;
return -1;
}
/* /*
* Fault tolerance against infinite * Fault tolerance against infinite
* zero-byte loop: re-try a finite * zero-byte loop: re-try a finite
@@ -1627,12 +1632,9 @@ read_again:
*/ */
if (retries_on_zero++ < max_retries) if (retries_on_zero++ < max_retries)
goto read_again; goto read_again;
}
errno = EIO; errno = EIO;
return -1; return -1;
}
return rv;
} }
static ssize_t static ssize_t