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

util/nvmutil: also do libc check on normal io

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-13 23:18:06 +00:00
parent 2a83a8ec43
commit fb57cedded
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+28 -14
View File
@@ -333,6 +333,7 @@ static ssize_t rw_file_once(int fd, u8 *mem, size_t len,
off_t off, int rw_type, size_t rc); off_t off, int rw_type, size_t rc);
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); off_t off, int rw_type);
static int rw_over_ssize_max(ssize_t r);
static off_t lseek_eintr(int fd, off_t off, int whence); static off_t lseek_eintr(int fd, off_t off, int whence);
/* /*
@@ -1702,7 +1703,8 @@ try_rw_again:
if (!positional_rw) { if (!positional_rw) {
if (r == -1 && errno == EINTR) if (r == -1 && errno == EINTR)
goto try_rw_again; goto try_rw_again;
return r;
return rw_over_ssize_max(r);
} }
flags = fcntl(fd, F_GETFL); flags = fcntl(fd, F_GETFL);
@@ -1728,20 +1730,8 @@ try_rw_again:
r = read(fd, mem, nrw); r = read(fd, mem, nrw);
else if (rw_type == IO_PWRITE) else if (rw_type == IO_PWRITE)
r = write(fd, mem, nrw); 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. r = rw_over_ssize_max(r);
We need to reset lseek */
}
} while (r < 0 && errno == EINTR); } while (r < 0 && errno == EINTR);
saved_errno = errno; saved_errno = errno;
@@ -1759,6 +1749,30 @@ err_prw:
return -1; return -1;
} }
/*
* Theoretical buggy libc
* check. Extremely academic.
*
* Specifications never
* allow this return value
* to exceed SSIZE_MAX, but
* spec != implementation
*
* Check this after using
* [p]read() or [p]write()
*/
static int
rw_over_ssize_max(ssize_t r)
{
if ((size_t)r > SSIZE_MAX) {
errno = EIO;
return -1;
}
return r;
}
static off_t static off_t
lseek_eintr(int fd, off_t off, int whence) lseek_eintr(int fd, off_t off, int whence)
{ {