diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-04 17:35:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set close-on-exec flag for most file descriptors

Browse Source
This commit is contained in:
Eric Fischer
2016-12-07 10:57:56 -08:00
parent 7514797c4c
commit 87d86ecfc9
4 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decode.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ void decode(char *fname, int z, unsigned x, unsigned y) {
int oz = z; int oz = z;
unsigned ox = x, oy = y; unsigned ox = x, oy = y;
int fd = open(fname, O_RDONLY); int fd = open(fname, O_RDONLY | O_CLOEXEC);
if (fd >= 0) { if (fd >= 0) {
struct stat st; struct stat st;
if (fstat(fd, &st) == 0) { if (fstat(fd, &st) == 0) {
main.cpp
+45 -26
View File
@@ -150,7 +150,7 @@ void init_cpus() {
long long fds[MAX_FILES]; long long fds[MAX_FILES];
long long i; long long i;
for (i = 0; i < MAX_FILES; i++) { for (i = 0; i < MAX_FILES; i++) {
fds[i] = open("/dev/null", O_RDONLY); fds[i] = open("/dev/null", O_RDONLY | O_CLOEXEC);
if (fds[i] < 0) { if (fds[i] < 0) {
break; break;
} }
@@ -567,23 +567,23 @@ void radix1(int *geomfds_in, int *indexfds_in, int inputs, int prefix, int split
char indexname[strlen(tmpdir) + strlen("/index.XXXXXXXX") + 1]; char indexname[strlen(tmpdir) + strlen("/index.XXXXXXXX") + 1];
sprintf(indexname, "%s%s", tmpdir, "/index.XXXXXXXX"); sprintf(indexname, "%s%s", tmpdir, "/index.XXXXXXXX");
geomfds[i] = mkstemp(geomname); geomfds[i] = mkstemp_cloexec(geomname);
if (geomfds[i] < 0) { if (geomfds[i] < 0) {
perror(geomname); perror(geomname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
indexfds[i] = mkstemp(indexname); indexfds[i] = mkstemp_cloexec(indexname);
if (indexfds[i] < 0) { if (indexfds[i] < 0) {
perror(indexname); perror(indexname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
geomfiles[i] = fopen(geomname, "wb"); geomfiles[i] = fopen_oflag(geomname, "wb", O_WRONLY | O_CLOEXEC);
if (geomfiles[i] == NULL) { if (geomfiles[i] == NULL) {
perror(geomname); perror(geomname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
indexfiles[i] = fopen(indexname, "wb"); indexfiles[i] = fopen_oflag(indexname, "wb", O_WRONLY | O_CLOEXEC);
if (indexfiles[i] == NULL) { if (indexfiles[i] == NULL) {
perror(indexname); perror(indexname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -962,33 +962,33 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
sprintf(geomname, "%s%s", tmpdir, "/geom.XXXXXXXX"); sprintf(geomname, "%s%s", tmpdir, "/geom.XXXXXXXX");
sprintf(indexname, "%s%s", tmpdir, "/index.XXXXXXXX"); sprintf(indexname, "%s%s", tmpdir, "/index.XXXXXXXX");
r->metafd = mkstemp(metaname); r->metafd = mkstemp_cloexec(metaname);
if (r->metafd < 0) { if (r->metafd < 0) {
perror(metaname); perror(metaname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
r->poolfd = mkstemp(poolname); r->poolfd = mkstemp_cloexec(poolname);
if (r->poolfd < 0) { if (r->poolfd < 0) {
perror(poolname); perror(poolname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
r->treefd = mkstemp(treename); r->treefd = mkstemp_cloexec(treename);
if (r->treefd < 0) { if (r->treefd < 0) {
perror(treename); perror(treename);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
r->geomfd = mkstemp(geomname); r->geomfd = mkstemp_cloexec(geomname);
if (r->geomfd < 0) { if (r->geomfd < 0) {
perror(geomname); perror(geomname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
r->indexfd = mkstemp(indexname); r->indexfd = mkstemp_cloexec(indexname);
if (r->indexfd < 0) { if (r->indexfd < 0) {
perror(indexname); perror(indexname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
r->metafile = fopen(metaname, "wb"); r->metafile = fopen_oflag(metaname, "wb", O_WRONLY | O_CLOEXEC);
if (r->metafile == NULL) { if (r->metafile == NULL) {
perror(metaname); perror(metaname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -1003,12 +1003,12 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
perror(treename); perror(treename);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
r->geomfile = fopen(geomname, "wb"); r->geomfile = fopen_oflag(geomname, "wb", O_WRONLY | O_CLOEXEC);
if (r->geomfile == NULL) { if (r->geomfile == NULL) {
perror(geomname); perror(geomname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
r->indexfile = fopen(indexname, "wb"); r->indexfile = fopen_oflag(indexname, "wb", O_WRONLY | O_CLOEXEC);
if (r->indexfile == NULL) { if (r->indexfile == NULL) {
perror(indexname); perror(indexname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -1134,7 +1134,7 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
fd = 0; fd = 0;
} else { } else {
reading = sources[source].file; reading = sources[source].file;
fd = open(sources[source].file.c_str(), O_RDONLY); fd = open(sources[source].file.c_str(), O_RDONLY, O_CLOEXEC);
if (fd < 0) { if (fd < 0) {
perror(sources[source].file.c_str()); perror(sources[source].file.c_str());
continue; continue;
@@ -1183,7 +1183,7 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
char readname[strlen(tmpdir) + strlen("/read.XXXXXXXX") + 1]; char readname[strlen(tmpdir) + strlen("/read.XXXXXXXX") + 1];
sprintf(readname, "%s%s", tmpdir, "/read.XXXXXXXX"); sprintf(readname, "%s%s", tmpdir, "/read.XXXXXXXX");
int readfd = mkstemp(readname); int readfd = mkstemp_cloexec(readname);
if (readfd < 0) { if (readfd < 0) {
perror(readname); perror(readname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -1235,7 +1235,7 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
ahead = 0; ahead = 0;
sprintf(readname, "%s%s", tmpdir, "/read.XXXXXXXX"); sprintf(readname, "%s%s", tmpdir, "/read.XXXXXXXX");
readfd = mkstemp(readname); readfd = mkstemp_cloexec(readname);
if (readfd < 0) { if (readfd < 0) {
perror(readname); perror(readname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -1334,13 +1334,13 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
char poolname[strlen(tmpdir) + strlen("/pool.XXXXXXXX") + 1]; char poolname[strlen(tmpdir) + strlen("/pool.XXXXXXXX") + 1];
sprintf(poolname, "%s%s", tmpdir, "/pool.XXXXXXXX"); sprintf(poolname, "%s%s", tmpdir, "/pool.XXXXXXXX");
int poolfd = mkstemp(poolname); int poolfd = mkstemp_cloexec(poolname);
if (poolfd < 0) { if (poolfd < 0) {
perror(poolname); perror(poolname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
FILE *poolfile = fopen(poolname, "wb"); FILE *poolfile = fopen_oflag(poolname, "wb", O_WRONLY | O_CLOEXEC);
if (poolfile == NULL) { if (poolfile == NULL) {
perror(poolname); perror(poolname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -1351,13 +1351,13 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
char metaname[strlen(tmpdir) + strlen("/meta.XXXXXXXX") + 1]; char metaname[strlen(tmpdir) + strlen("/meta.XXXXXXXX") + 1];
sprintf(metaname, "%s%s", tmpdir, "/meta.XXXXXXXX"); sprintf(metaname, "%s%s", tmpdir, "/meta.XXXXXXXX");
int metafd = mkstemp(metaname); int metafd = mkstemp_cloexec(metaname);
if (metafd < 0) { if (metafd < 0) {
perror(metaname); perror(metaname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
FILE *metafile = fopen(metaname, "wb"); FILE *metafile = fopen_oflag(metaname, "wb", O_WRONLY | O_CLOEXEC);
if (metafile == NULL) { if (metafile == NULL) {
perror(metaname); perror(metaname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -1434,12 +1434,12 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
char indexname[strlen(tmpdir) + strlen("/index.XXXXXXXX") + 1]; char indexname[strlen(tmpdir) + strlen("/index.XXXXXXXX") + 1];
sprintf(indexname, "%s%s", tmpdir, "/index.XXXXXXXX"); sprintf(indexname, "%s%s", tmpdir, "/index.XXXXXXXX");
int indexfd = mkstemp(indexname); int indexfd = mkstemp_cloexec(indexname);
if (indexfd < 0) { if (indexfd < 0) {
perror(indexname); perror(indexname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
FILE *indexfile = fopen(indexname, "wb"); FILE *indexfile = fopen_oflag(indexname, "wb", O_WRONLY | O_CLOEXEC);
if (indexfile == NULL) { if (indexfile == NULL) {
perror(indexname); perror(indexname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -1450,12 +1450,12 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
char geomname[strlen(tmpdir) + strlen("/geom.XXXXXXXX") + 1]; char geomname[strlen(tmpdir) + strlen("/geom.XXXXXXXX") + 1];
sprintf(geomname, "%s%s", tmpdir, "/geom.XXXXXXXX"); sprintf(geomname, "%s%s", tmpdir, "/geom.XXXXXXXX");
int geomfd = mkstemp(geomname); int geomfd = mkstemp_cloexec(geomname);
if (geomfd < 0) { if (geomfd < 0) {
perror(geomname); perror(geomname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
FILE *geomfile = fopen(geomname, "wb"); FILE *geomfile = fopen_oflag(geomname, "wb", O_WRONLY | O_CLOEXEC);
if (geomfile == NULL) { if (geomfile == NULL) {
perror(geomname); perror(geomname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -2166,7 +2166,7 @@ int main(int argc, char **argv) {
} }
} }
files_open_at_start = open("/dev/null", O_RDONLY); files_open_at_start = open("/dev/null", O_RDONLY | O_CLOEXEC);
if (files_open_at_start < 0) { if (files_open_at_start < 0) {
perror("open /dev/null"); perror("open /dev/null");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -2245,7 +2245,7 @@ int main(int argc, char **argv) {
muntrace(); muntrace();
#endif #endif
i = open("/dev/null", O_RDONLY); i = open("/dev/null", O_RDONLY | O_CLOEXEC);
// i < files_open_at_start is not an error, because reading from a pipe closes stdin // i < files_open_at_start is not an error, because reading from a pipe closes stdin
if (i > files_open_at_start) { if (i > files_open_at_start) {
fprintf(stderr, "Internal error: did not close all files: %d\n", i); fprintf(stderr, "Internal error: did not close all files: %d\n", i);
@@ -2254,3 +2254,22 @@ int main(int argc, char **argv) {
return ret; return ret;
} }
int mkstemp_cloexec(char *name) {
int fd = mkstemp(name);
if (fd >= 0) {
if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) {
perror("cloexec for temporary file");
exit(EXIT_FAILURE);
}
}
return fd;
}
FILE *fopen_oflag(const char *name, const char *mode, int oflag) {
int fd = open(name, oflag);
if (fd < 0) {
return NULL;
}
return fdopen(fd, mode);
}
main.hpp
+3
View File
@@ -16,3 +16,6 @@ extern size_t CPUS;
extern size_t TEMP_FILES; extern size_t TEMP_FILES;
extern size_t max_tile_size; extern size_t max_tile_size;
int mkstemp_cloexec(char *name);
FILE *fopen_oflag(const char *name, const char *mode, int oflag);
tile.cpp
+2 -1
View File
@@ -20,6 +20,7 @@
#include <pthread.h> #include <pthread.h>
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#include <fcntl.h>
#include "mvt.hpp" #include "mvt.hpp"
#include "mbtiles.hpp" #include "mbtiles.hpp"
#include "geometry.hpp" #include "geometry.hpp"
@@ -2067,7 +2068,7 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
perror(geomname); perror(geomname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
sub[j] = fopen(geomname, "wb"); sub[j] = fopen_oflag(geomname, "wb", O_WRONLY | O_CLOEXEC);
if (sub[j] == NULL) { if (sub[j] == NULL) {
perror(geomname); perror(geomname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);