From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Wed, 12 Jun 2019 14:27:55 +0000 (+0100)
Subject: fw_env: Add missing write failure check
X-Git-Tag: v2019.07~22^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a762311a6cf02396977f59babdf945c226f4404f;p=oweals%2Fu-boot.git

fw_env: Add missing write failure check

If flash_write fails, whilst we propagate this up to our caller, we need
to avoid swapping in the new file (if we're on a filesystem) in this
case.

Fixes: dbc34323796b ("tools: env: Implement atomic replace for filesystem")
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index cfada0ee11..eef12dd2b7 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -1317,7 +1317,7 @@ static int flash_io_write(int fd_current)
 			rc = -1;
 		}
 
-		if (target_temp) {
+		if (rc >= 0 && target_temp) {
 			int dir_fd;
 
 			dir_fd = open(dname, O_DIRECTORY | O_RDONLY);