From 34eeca1f031f1b7ab559f5e6d840b4f4aca9eabe Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 7 Apr 2023 02:08:06 +0100
Subject: util/nvmutil: fix possible regression

i went too hard on the sloc reductions

a check inside a for loop could cause
incomplete reading of gbe images

revert that
---
 util/nvmutil/nvmutil.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c
index 64448ddb..9f4e03cf 100644
--- a/util/nvmutil/nvmutil.c
+++ b/util/nvmutil/nvmutil.c
@@ -164,7 +164,9 @@ readGbeFile(int *fd, const char *path, int flags, size_t nr)
 	else if (errno == ENOTDIR)
 		errno = 0;
 
-	for (int p = 0; (p < 2) && (!skipread[p]); p++) {
+	for (int p = 0; p < 2; p++) {
+		if (skipread[p])
+			continue;
 		if (pread((*fd), (uint8_t *) gbe[p], nr, p << 12) == -1)
 			err(errno, "%s", path);
 		if (big_endian)
-- 
cgit v1.2.1