2 files changed, 6 insertions, 1 deletions
diff --git a/Monitor.c b/Monitor.c
index 92936374..79a88a7d 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -234,6 +234,7 @@ int Monitor(mddev_dev_t devlist,
 */				st->err=1;
 				continue;
 			}
+			fcntl(fd, F_SETFD, FD_CLOEXEC);
 			if (ioctl(fd, GET_ARRAY_INFO, &array)<0) {
 				if (!st->err)
 					alert("DeviceDisappeared", dev, NULL,
diff --git a/mdstat.c b/mdstat.c
index de31acbf..335e1e58 100644
--- a/mdstat.c
+++ b/mdstat.c
@@ -114,6 +114,8 @@ struct mdstat_ent *mdstat_read(int hold, int start)
 		f = fopen("/proc/mdstat", "r");
 	if (f == NULL)
 		return NULL;
+	else
+		fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
 
 	all = NULL;
 	end = &all;
@@ -221,8 +223,10 @@ struct mdstat_ent *mdstat_read(int hold, int start)
 			end = &ent->next;
 		}
 	}
-	if (hold && mdstat_fd == -1)
+	if (hold && mdstat_fd == -1) {
 		mdstat_fd = dup(fileno(f));
+		fcntl(mdstat_fd, F_SETFD, FD_CLOEXEC);
+	}
 	fclose(f);
 
 	/* If we might want to start array,