From: Karel Zak <kzak@redhat.com>
Date: Tue, 19 Apr 2022 07:44:07 +0000 (+0200)
Subject: libblkid: check fsync() return code
X-Git-Tag: v2.39-rc1~710
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=133a0d70f637b4f4e4337811e452153b04f2bdcf;p=thirdparty%2Futil-linux.git

libblkid: check fsync() return code

Since 39f5af25982d8b0244000e92a9d0e0e6557d0e17 libblkid uses
O_NONBLOCK. Now it's more obvious that check fsync() (and close())
return value after write() is always a good idea ...

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2074486
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 31706240fc..4f6604fa35 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -1414,7 +1414,8 @@ int blkid_do_wipe(blkid_probe pr, int dryrun)
 			/* wipen on device */
 			if (write_all(fd, buf, len))
 				return -1;
-			fsync(fd);
+			if (fsync(fd) != 0)
+				return -1;
 		} else {
 #ifdef HAVE_LINUX_BLKZONED_H
 			uint64_t zone_mask = ~(pr->zone_size - 1);
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 8cdc0a7ebe..6be470bbba 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -593,7 +593,9 @@ static int do_wipe(struct wipe_control *ctl)
 	if (need_force)
 		warnx(_("Use the --force option to force erase."));
 
-	fsync(blkid_probe_get_fd(pr));
+	if (fsync(blkid_probe_get_fd(pr)) != 0)
+		err(EXIT_FAILURE, _("%s: cannot flush modified buffers"),
+				ctl->devname);
 
 #ifdef BLKRRPART
 	if (reread && (mode & O_EXCL)) {
@@ -613,7 +615,9 @@ static int do_wipe(struct wipe_control *ctl)
 	}
 #endif
 
-	close(blkid_probe_get_fd(pr));
+	if (close(blkid_probe_get_fd(pr)) != 0)
+		err(EXIT_FAILURE, _("%s: close device failed"), ctl->devname);
+
 	blkid_free_probe(pr);
 	free(backup);
 	return 0;