diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-03-13 14:25:31 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-03-13 14:25:31 +0000 |
| commit | e2f55af07f5078e43a376dd6c650c481f5d7baff (patch) | |
| tree | 96f5b06c779aa0d10469a2cd281eccc027476ba1 /util/nvmutil/nvmutil.c | |
| parent | b95aacb8c6766b6382a194d85a8c2c049290ea2a (diff) | |
util/nvmutil: stricter i/o errors
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'util/nvmutil/nvmutil.c')
| -rw-r--r-- | util/nvmutil/nvmutil.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index 1095a02a..b6a43908 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -1604,10 +1604,11 @@ rw_file_once(int fd, uint8_t *mem, size_t len, size_t retries_on_zero = 0; size_t max_retries = 10; -read_again: - if ((unsigned int)rw_type > IO_PWRITE) + if (fd < 0 || !len || len > (size_t)SSIZE_MAX + || (unsigned int)rw_type > IO_PWRITE) goto err_rw_file_once; +read_again: rv = do_rw(fd, mem + rc, len - rc, off + rc, rw_type); if (rv < 0 && errno == EINTR) @@ -1668,10 +1669,9 @@ prw(int fd, void *mem, size_t nrw, prw_type = rw_type ^ IO_PREAD; - if ((unsigned int)prw_type > IO_WRITE) { - errno = EIO; - return -1; - } + if (fd < 0 || !nrw || nrw > (size_t)SSIZE_MAX + || (unsigned int)prw_type > IO_WRITE) + goto err_prw; if ((off_orig = lseek_eintr(fd, (off_t)0, SEEK_CUR)) == (off_t)-1) return -1; @@ -1691,6 +1691,10 @@ prw(int fd, void *mem, size_t nrw, errno = saved_errno; return r; + +err_prw: + errno = EIO; + return -1; } static off_t |