mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-21 19:26:22 +02:00
util/nvmutil: err if file offset fails
currently it returns success, if restoring a previous offset failed. this leaves descriptor corrupted when the caller thinks otherwise return -1 instead, so that the caller can treat it as an error, relying on whatever lseek had set for errno Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
@@ -1370,13 +1370,13 @@ static ssize_t
|
|||||||
prw(int fd, void *mem, size_t count,
|
prw(int fd, void *mem, size_t count,
|
||||||
off_t offset, int rw_type, const char *path)
|
off_t offset, int rw_type, const char *path)
|
||||||
{
|
{
|
||||||
off_t rs;
|
|
||||||
off_t old;
|
off_t old;
|
||||||
ssize_t r;
|
ssize_t r;
|
||||||
|
|
||||||
if ((old = lseek_eintr(fd, (off_t)0, SEEK_CUR)) == (off_t)-1)
|
if ((old = lseek_eintr(fd, (off_t)0, SEEK_CUR)) == (off_t)-1)
|
||||||
return -1;
|
return -1;
|
||||||
if ((r = lseek_eintr(fd, offset, SEEK_SET)) == (off_t)-1)
|
|
||||||
|
if (lseek_eintr(fd, offset, SEEK_SET) == (off_t)-1)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
@@ -1389,8 +1389,8 @@ prw(int fd, void *mem, size_t count,
|
|||||||
} while (r < 0 && errno == EINTR);
|
} while (r < 0 && errno == EINTR);
|
||||||
|
|
||||||
if (r >= 0) {
|
if (r >= 0) {
|
||||||
if ((rs = lseek_eintr(fd, old, SEEK_SET)) == (off_t)-1)
|
if (lseek_eintr(fd, old, SEEK_SET) == (off_t)-1)
|
||||||
errno = EIO;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
|
|||||||
Reference in New Issue
Block a user