MDEV-8743: use O_CLOEXEC (innodb/xtradb)

MariaDB · Mar 1, 2018 · 9629bca · 9629bca
1 parent 7cec685
commit 9629bca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
@@ -1184,10 +1184,10 @@ os_file_create_simple_func(
 	}
 
 	if (create_mode == OS_FILE_CREATE) {
-		file = open(name, create_flag, S_IRUSR | S_IWUSR
+		file = open(name, create_flag | O_CLOEXEC, S_IRUSR | S_IWUSR
 			    | S_IRGRP | S_IWGRP);
 	} else {
-		file = open(name, create_flag);
+		file = open(name, create_flag | O_CLOEXEC);
 	}
 
 	if (file == -1) {
@@ -1631,7 +1631,7 @@ os_file_create_func(
 	}
 #endif /* O_SYNC */
 
-	file = open(name, create_flag, os_innodb_umask);
+	file = open(name, create_flag | O_CLOEXEC, os_innodb_umask);
 
 	if (file == -1) {
 		*success = FALSE;

diff --git a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c
@@ -1286,10 +1286,10 @@ os_file_create_simple_func(
 	}
 
 	if (create_mode == OS_FILE_CREATE) {
-		file = open(name, create_flag, S_IRUSR | S_IWUSR
+		file = open(name, create_flag | O_CLOEXEC, S_IRUSR | S_IWUSR
 			    | S_IRGRP | S_IWGRP);
 	} else {
-		file = open(name, create_flag);
+		file = open(name, create_flag | O_CLOEXEC);
 	}
 
 	if (file == -1) {
@@ -1752,7 +1752,7 @@ os_file_create_func(
 	}
 #endif /* O_SYNC */
 
-	file = open(name, create_flag, os_innodb_umask);
+	file = open(name, create_flag | O_CLOEXEC, os_innodb_umask);
 
 	if (file == -1) {
 		*success = FALSE;