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

util/nvmutil: fix verified first, in prw loop

Browse Source 
yes, because otherwise if the offset is still
wrong, we allow junk to be written. bad!

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-15 02:14:23 +00:00
parent 31835eb8e3
commit 0d6bb8d747
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+13 -13
View File
@@ -2086,19 +2086,6 @@ real_pread_pwrite:
loop_eagain, loop_eintr); loop_eagain, loop_eintr);
do { do {
if (off != verified)
goto err_prw;
if (rw_type == IO_PREAD)
r = read(fd, mem, nrw);
else if (rw_type == IO_PWRITE)
r = write(fd, mem, nrw);
if (rw_over_nrw(r, nrw) == -1) {
errno = EIO;
break;
}
/* /*
* Verify again before I/O * Verify again before I/O
* (even with OFF_ERR) * (even with OFF_ERR)
@@ -2119,6 +2106,19 @@ real_pread_pwrite:
verified = lseek_loop(fd, (off_t)0, SEEK_CUR, verified = lseek_loop(fd, (off_t)0, SEEK_CUR,
loop_eagain, loop_eintr); loop_eagain, loop_eintr);
if (off != verified)
goto err_prw;
if (rw_type == IO_PREAD)
r = read(fd, mem, nrw);
else if (rw_type == IO_PWRITE)
r = write(fd, mem, nrw);
if (rw_over_nrw(r, nrw) == -1) {
errno = EIO;
break;
}
} while (r == -1 && } while (r == -1 &&
(errno == try_err(loop_eintr, EINTR) (errno == try_err(loop_eintr, EINTR)
|| errno == try_err(loop_eagain, EAGAIN))); || errno == try_err(loop_eagain, EAGAIN)));