splatink/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-03-25 13:29:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: move libc check to prw()

Browse Source 
this still gets done from rw_once, but
it's generic enough that we want it in
our prw() wrapper function.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-13 22:59:48 +00:00
parent cd74a2a641
commit 0450c2bef1
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
util/nvmutil/nvmutil.c
View File

@@ -1640,8 +1640,7 @@ read_again:
if (rv < 0)
return -1;
if ((size_t)rv > SSIZE_MAX /* theoretical buggy libc */
|| (size_t)rv > (nrw - rc))/* don't overflow */
if ((size_t)rv > (nrw - rc))/* don't overflow */
goto err_rw_file_once;
if (rv != 0)
@@ -1730,6 +1729,20 @@ try_rw_again:
r = read(fd, mem, nrw);
else if (rw_type == IO_PWRITE)
r = write(fd, mem, nrw);
if ((size_t)r > SSIZE_MAX) {
/*
* Theoretical buggy libc.
* Specifications never
* allow this return value
* to exceed SSIZE_MAX, but
* spec != implementation
*/
errno = EIO;
r = -1;
/* Don't use the goto here.
We need to reset lseek */
}
} while (r < 0 && errno == EINTR);
saved_errno = errno;