From 90fada0a2399e11251ec0180a8f4075de8163b6c Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 10 Mar 2026 06:17:04 +0000 Subject: util/nvmutil: explain errval handling in err() Signed-off-by: Leah Rowe --- util/nvmutil/nvmutil.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'util/nvmutil') diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index d800ea39..caa03e28 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -1373,6 +1373,21 @@ rw_file_exact(int fd, uint8_t *mem, size_t len, static void err(int nvm_errval, const char *msg, ...) { + /* + * We need to ensure that files are closed + * on exit, including error exits. This + * would otherwise recurse, because the + * close_files() function also calls err(), + * but with -1 on nvm_errval. It's the only + * one that does this. + * + * Since the errval is for setting errno, -1 + * would be incorrect. Therefore, set_err() + * avoids overriding errno if the given value + * is negative. + * + * Be careful modifying err() and close_files(). + */ if (nvm_errval != -1) close_files(); -- cgit v1.2.1