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

util/nvmutil: re-add io_args()

Browse Source 
unified arg check for prw and rw_file_exact

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-14 23:35:24 +00:00
parent 7263125d60
commit 2d46837475
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+27 -18
View File
@@ -416,6 +416,8 @@ static ssize_t rw_file_exact(int fd, u8 *mem, size_t len,
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,
int off_reset); int off_reset);
static int io_args(int fd, void *mem, size_t nrw,
off_t off, int rw_type);
static int check_file(int fd, struct stat *st); static int check_file(int fd, struct stat *st);
static ssize_t rw_over_nrw(ssize_t r, size_t nrw); static ssize_t rw_over_nrw(ssize_t r, size_t nrw);
#if !defined(HAVE_REAL_PREAD_PWRITE) || \ #if !defined(HAVE_REAL_PREAD_PWRITE) || \
@@ -1888,15 +1890,8 @@ rw_file_exact(int fd, u8 *mem, size_t nrw,
size_t nrw_cur; size_t nrw_cur;
void *mem_cur; void *mem_cur;
if (mem == NULL) if (io_args(fd, mem, nrw, off, rw_type) == -1)
goto err_rw_file_exact; return -1;
if (fd < 0
|| off < 0
|| !nrw /* prevent zero read request */
|| nrw > (size_t)SSIZE_MAX /* prevent overflow */
|| (uint)rw_type > IO_PWRITE)
goto err_rw_file_exact;
while (1) { while (1) {
@@ -1997,15 +1992,8 @@ prw(int fd, void *mem, size_t nrw,
off_t off_last; off_t off_last;
#endif #endif
if (mem == NULL) if (io_args(fd, mem, nrw, off, rw_type) == -1)
goto err_prw; return -1;
if (fd < 0
|| off < 0
|| !nrw /* prevent zero read request */
|| nrw > (size_t)SSIZE_MAX /* prevent overflow */
|| (uint)rw_type > IO_PWRITE)
goto err_prw;
r = -1; r = -1;
@@ -2134,6 +2122,27 @@ err_prw:
return -1; return -1;
} }
static int
io_args(int fd, void *mem, size_t nrw,
off_t off, int rw_type)
{
if (mem == NULL)
goto err_io_args;
if (fd < 0
|| off < 0
|| !nrw /* prevent zero read request */
|| nrw > (size_t)SSIZE_MAX /* prevent overflow */
|| (uint)rw_type > IO_PWRITE)
goto err_io_args;
return 0;
err_io_args:
errno = EIO;
return -1;
}
static int static int
check_file(int fd, struct stat *st) check_file(int fd, struct stat *st)
{ {