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

util/nvmutil: detect partial gbe rw

Browse Source 
we already covered this in prw() which is
what ultimately gets called, but still.

it's logically correct not to check it here.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-14 03:29:01 +00:00
parent fe16b79537
commit df18e65835
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+18 -5
View File
@@ -1489,6 +1489,7 @@ static void
rw_gbe_file_part(size_t p, int rw_type, rw_gbe_file_part(size_t p, int rw_type,
const char *rw_type_str) const char *rw_type_str)
{ {
ssize_t r;
size_t gbe_rw_size = command[cmd_index].rw_size; size_t gbe_rw_size = command[cmd_index].rw_size;
u8 invert = command[cmd_index].invert; u8 invert = command[cmd_index].invert;
@@ -1509,11 +1510,17 @@ rw_gbe_file_part(size_t p, int rw_type,
mem_offset = gbe_mem_offset(p ^ invert, rw_type_str); mem_offset = gbe_mem_offset(p ^ invert, rw_type_str);
file_offset = (off_t)gbe_file_offset(p, rw_type_str); file_offset = (off_t)gbe_file_offset(p, rw_type_str);
if (rw_gbe_file_exact(gbe_fd, mem_offset, r = rw_gbe_file_exact(gbe_fd, mem_offset,
gbe_rw_size, file_offset, rw_type) == -1) gbe_rw_size, file_offset, rw_type);
if (r == -1)
err(errno, "%s: %s: part %lu", err(errno, "%s: %s: part %lu",
fname, rw_type_str, (ulong)p); fname, rw_type_str, (ulong)p);
if ((size_t)r != gbe_rw_size)
err(EIO, "%s: partial %s: part %lu",
fname, rw_type_str, (ulong)p);
/* /*
* Next, we read back what was written, * Next, we read back what was written,
* to ensure that it was done correctly. * to ensure that it was done correctly.
@@ -1531,12 +1538,18 @@ rw_gbe_file_part(size_t p, int rw_type,
err(errno, "%s: fsync: part %lu (post-verification)", err(errno, "%s: fsync: part %lu (post-verification)",
fname, (ulong)p); fname, (ulong)p);
if (rw_gbe_file_exact(gbe_fd, pad, r = rw_gbe_file_exact(gbe_fd, pad,
gbe_rw_size, file_offset, IO_PREAD) == -1) gbe_rw_size, file_offset, IO_PREAD);
if (r == -1)
err(errno, "%s: pread: part %lu (post-verification)", err(errno, "%s: pread: part %lu (post-verification)",
fname, (ulong)p); fname, (ulong)p);
if (memcmp(mem_offset, pad, gbe_rw_size)) if ((size_t)r != gbe_rw_size)
err(EIO, "%s: partial pread: part %lu (post-verification)",
fname, (ulong)p);
if (memcmp(mem_offset, pad, gbe_rw_size) != 0)
err(errno, "%s: pwrite: corrupt write on part %lu", err(errno, "%s: pwrite: corrupt write on part %lu",
fname, (ulong)p); fname, (ulong)p);
} }