From 91a6395e5cbfd70f5227d1a6b347444dcb7dea5f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 10 Mar 2026 10:26:12 +0000 Subject: util/nvmutil: preserve errno during i/o do not clobber errno yeah we're basically being libc now Signed-off-by: Leah Rowe --- util/nvmutil/nvmutil.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'util/nvmutil/nvmutil.c') diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index 2bc74615..71e16f46 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -1372,6 +1372,7 @@ prw(int fd, void *mem, size_t count, { off_t old; ssize_t r; + int saved_errno = 0; if ((old = lseek_eintr(fd, (off_t)0, SEEK_CUR)) == (off_t)-1) return -1; @@ -1388,9 +1389,15 @@ prw(int fd, void *mem, size_t count, err(EIO, "%s: Invalid rw_type", path); } while (r < 0 && errno == EINTR); + if (r < 0) + saved_errno = errno; + if (lseek_eintr(fd, old, SEEK_SET) == (off_t)-1) return -1; + if (r < 0) + errno = saved_errno; + return r; } -- cgit v1.2.1