From: Karel Zak <kzak@redhat.com>
Date: Tue, 1 Oct 2013 14:56:26 +0000 (+0200)
Subject: libmount: make mnt_table_replace_file() more robust [coverity scan]
X-Git-Tag: v2.24-rc2~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a84ec176eca207eadcd2a47056ad44df082f1b02;p=thirdparty%2Futil-linux.git

libmount: make mnt_table_replace_file() more robust [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/tab_update.c b/libmount/src/tab_update.c
index a508b99034..13f6f6ebec 100644
--- a/libmount/src/tab_update.c
+++ b/libmount/src/tab_update.c
@@ -640,6 +640,12 @@ int mnt_table_replace_file(struct libmnt_table *tb, const char *filename)
 
 		mnt_table_write_file(tb, f);
 
+		if (fflush(f) != 0) {
+			rc = -errno;
+			DBG(UPDATE, mnt_debug("%s: fflush failed: %m", uq));
+			goto leave;
+		}
+
 		rc = fchmod(fd, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) ? -errno : 0;
 
 		if (!rc && stat(filename, &st) == 0)
@@ -647,19 +653,25 @@ int mnt_table_replace_file(struct libmnt_table *tb, const char *filename)
 			rc = fchown(fd, st.st_uid, st.st_gid) ? -errno : 0;
 
 		fclose(f);
+		f = NULL;
+
 		if (!rc)
-			rename(uq, filename);
+			rc = rename(uq, filename) ? -errno : 0;
 	} else {
 		rc = -errno;
 		close(fd);
 	}
 
+leave:
+	if (f)
+		fclose(f);
 	unlink(uq);
 	free(uq);
 
 	DBG(TAB, mnt_debug_h(tb, "replace done [rc=%d]", rc));
 	return rc;
 }
+
 static int add_file_entry(struct libmnt_table *tb, struct libmnt_update *upd)
 {
 	struct libmnt_fs *fs;