libblkid: use O_CLOEXEC

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

9 files changed, 14 insertions, 14 deletions

diff --git a/libblkid/src/config.c b/libblkid/src/config.c
index edad6cd7c..0b2ef20c3 100644
--- a/libblkid/src/config.c
+++ b/libblkid/src/config.c
@@ -128,7 +128,7 @@ struct blkid_config *blkid_read_config(const char *filename)
 	DBG(DEBUG_CONFIG, fprintf(stderr,
 		"reading config file: %s.\n", filename));
 
-	f = fopen(filename, "r");
+	f = fopen(filename, "r" UL_CLOEXECSTR);
 	if (!f) {
 		DBG(DEBUG_CONFIG, fprintf(stderr,
 			"%s: does not exist, using built-in default\n", filename));
diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
index dc2e0caa6..68270d911 100644
--- a/libblkid/src/devname.c
+++ b/libblkid/src/devname.c
@@ -259,7 +259,7 @@ static dev_t lvm_get_devno(const char *lvm_device)
 	dev_t ret = 0;
 
 	DBG(DEBUG_DEVNAME, printf("opening %s\n", lvm_device));
-	if ((lvf = fopen(lvm_device, "r")) == NULL) {
+	if ((lvf = fopen(lvm_device, "r" UL_CLOEXECSTR)) == NULL) {
 		DBG(DEBUG_DEVNAME, printf("%s: (%d) %m\n", lvm_device, errno));
 		return 0;
 	}
@@ -347,7 +347,7 @@ evms_probe_all(blkid_cache cache, int only_if_new)
 	FILE *procpt;
 	char device[110];
 
-	procpt = fopen(PROC_EVMS_VOLUMES, "r");
+	procpt = fopen(PROC_EVMS_VOLUMES, "r" UL_CLOEXECSTR);
 	if (!procpt)
 		return 0;
 	while (fgets(line, sizeof(line), procpt)) {
@@ -446,7 +446,7 @@ static int probe_all(blkid_cache cache, int only_if_new)
 #endif
 	ubi_probe_all(cache, only_if_new);
 
-	proc = fopen(PROC_PARTITIONS, "r");
+	proc = fopen(PROC_PARTITIONS, "r" UL_CLOEXECSTR);
 	if (!proc)
 		return -BLKID_ERR_PROC;
 
diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
index 906c91fcd..cdf3d5bfc 100644
--- a/libblkid/src/devno.c
+++ b/libblkid/src/devno.c
@@ -300,7 +300,7 @@ int blkid_driver_has_major(const char *drvname, int major)
 	char buf[128];
 	int match = 0;
 
-	f = fopen(_PATH_PROC_DEVICES, "r");
+	f = fopen(_PATH_PROC_DEVICES, "r" UL_CLOEXECSTR);
 	if (!f)
 		return 0;
 
diff --git a/libblkid/src/evaluate.c b/libblkid/src/evaluate.c
index 2e1ca574d..e03370750 100644
--- a/libblkid/src/evaluate.c
+++ b/libblkid/src/evaluate.c
@@ -118,7 +118,7 @@ int blkid_send_uevent(const char *devname, const char *action)
 	snprintf(uevent, sizeof(uevent), "/sys/dev/block/%d:%d/uevent",
 			major(st.st_rdev), minor(st.st_rdev));
 
-	f = fopen(uevent, "w");
+	f = fopen(uevent, "w" UL_CLOEXECSTR);
 	if (f) {
 		rc = 0;
 		if (fputs(action, f) >= 0)
diff --git a/libblkid/src/read.c b/libblkid/src/read.c
index 8914cad69..0065b4854 100644
--- a/libblkid/src/read.c
+++ b/libblkid/src/read.c
@@ -412,7 +412,7 @@ void blkid_read_cache(blkid_cache cache)
 	DBG(DEBUG_CACHE, printf("reading cache file %s\n",
 				cache->bic_filename));
 
-	file = fdopen(fd, "r");
+	file = fdopen(fd, "r" UL_CLOEXECSTR);
 	if (!file)
 		goto errout;
 
diff --git a/libblkid/src/save.c b/libblkid/src/save.c
index c94cc2a82..849632f79 100644
--- a/libblkid/src/save.c
+++ b/libblkid/src/save.c
@@ -113,11 +113,11 @@ int blkid_flush_cache(blkid_cache cache)
 		tmp = malloc(strlen(filename) + 8);
 		if (tmp) {
 			sprintf(tmp, "%s-XXXXXX", filename);
-			fd = mkstemp(tmp);
+			fd = mkostemp(tmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
 			if (fd >= 0) {
 				if (fchmod(fd, 0644) != 0)
 					DBG(DEBUG_SAVE,	printf("%s: fchmod failed\n", filename));
-				else if ((file = fdopen(fd, "w")))
+				else if ((file = fdopen(fd, "w" UL_CLOEXECSTR)))
 					opened = tmp;
 				if (!file)
 					close(fd);
@@ -126,7 +126,7 @@ int blkid_flush_cache(blkid_cache cache)
 	}
 
 	if (!file) {
-		file = fopen(filename, "w");
+		file = fopen(filename, "w" UL_CLOEXECSTR);
 		opened = filename;
 	}
 
diff --git a/libblkid/src/superblocks/ext.c b/libblkid/src/superblocks/ext.c
index eff96a066..f36556bca 100644
--- a/libblkid/src/superblocks/ext.c
+++ b/libblkid/src/superblocks/ext.c
@@ -140,7 +140,7 @@ static int fs_proc_check(const char *fs_name)
 	FILE	*f;
 	char	buf[80], *cp, *t;
 
-	f = fopen("/proc/filesystems", "r");
+	f = fopen("/proc/filesystems", "r" UL_CLOEXECSTR);
 	if (!f)
 		return 0;
 	while (!feof(f)) {
@@ -184,7 +184,7 @@ static int check_for_modules(const char *fs_name)
 		return 0;
 	snprintf(buf, sizeof(buf), "/lib/modules/%s/modules.dep", uts.release);
 
-	f = fopen(buf, "r");
+	f = fopen(buf, "r" UL_CLOEXECSTR);
 	if (!f)
 		return 0;
 
diff --git a/libblkid/src/topology/dm.c b/libblkid/src/topology/dm.c
index 72ec9bd8e..dd058536c 100644
--- a/libblkid/src/topology/dm.c
+++ b/libblkid/src/topology/dm.c
@@ -104,7 +104,7 @@ static int probe_dm_tp(blkid_probe pr,
 		break;
 	}
 
-	stream = fdopen(dmpipe[0], "r");
+	stream = fdopen(dmpipe[0], "r" UL_CLOEXECSTR);
 	if (!stream)
 		goto nothing;
 
diff --git a/libblkid/src/topology/lvm.c b/libblkid/src/topology/lvm.c
index 632c42b71..d5bce28fb 100644
--- a/libblkid/src/topology/lvm.c
+++ b/libblkid/src/topology/lvm.c
@@ -107,7 +107,7 @@ static int probe_lvm_tp(blkid_probe pr,
 		break;
 	}
 
-	stream = fdopen(lvpipe[0], "r");
+	stream = fdopen(lvpipe[0], "r" UL_CLOEXECSTR);
 	if (!stream)
 		goto nothing;