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

util/nvmutil: tidy up prw()

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-13 14:41:36 +00:00
parent 3e08c0724b
commit 5ece694e67
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+6 -3
View File
@@ -1663,20 +1663,22 @@ prw(int fd, void *mem, size_t nrw,
|| (unsigned int)prw_type > IO_WRITE) || (unsigned int)prw_type > IO_WRITE)
goto err_prw; goto err_prw;
flags = fcntl(fd, F_GETFL);
if (flags == -1)
return -1;
/* /*
* O_APPEND must not be used, because this * O_APPEND must not be used, because this
* allows POSIX write() to ignore the * allows POSIX write() to ignore the
* current write offset and write at EOF, * current write offset and write at EOF,
* which would therefore break pread/pwrite * which would therefore break pread/pwrite
*/ */
flags = fcntl(fd, F_GETFL);
if (flags == -1)
return -1;
if (flags & O_APPEND) if (flags & O_APPEND)
goto err_prw; goto err_prw;
if ((off_orig = lseek_eintr(fd, (off_t)0, SEEK_CUR)) == (off_t)-1) if ((off_orig = lseek_eintr(fd, (off_t)0, SEEK_CUR)) == (off_t)-1)
return -1; return -1;
if (lseek_eintr(fd, off, SEEK_SET) == (off_t)-1) if (lseek_eintr(fd, off, SEEK_SET) == (off_t)-1)
return -1; return -1;
@@ -1688,6 +1690,7 @@ prw(int fd, void *mem, size_t nrw,
if (lseek_eintr(fd, off_orig, SEEK_SET) == (off_t)-1) { if (lseek_eintr(fd, off_orig, SEEK_SET) == (off_t)-1) {
if (r < 0) if (r < 0)
errno = saved_errno; errno = saved_errno;
return -1; return -1;
} }
errno = saved_errno; errno = saved_errno;