diff options
| author | Tom Tromey <tom@tromey.com> | 2018-09-20 16:04:04 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-10-27 11:58:41 -0600 |
| commit | b3279b601e67ce47263082ef86cfc86e25607c5e (patch) | |
| tree | 3541a773fd698068cad1ae16a2842257c845eb61 /gdb/common | |
| parent | e418a61a67a3476826259163383e5deb661042cc (diff) | |
| download | gdb-b3279b601e67ce47263082ef86cfc86e25607c5e.zip gdb-b3279b601e67ce47263082ef86cfc86e25607c5e.tar.gz gdb-b3279b601e67ce47263082ef86cfc86e25607c5e.tar.bz2 | |
Use mkostemp, not mkstemp
I noticed that gdb could leak file descriptors coming from mkstemp.
This patch fixes the problem by importing the gnulib mkostemp instead,
and then changing gdb to pass O_CLOEXEC.
A small gnulib patch was needed. This has already been accepted
upstream.
gdb/ChangeLog
2018-10-27 Tom Tromey <tom@tromey.com>
* unittests/scoped_mmap-selftests.c (test_normal): Use
gdb_mkostemp_cloexec.
* unittests/scoped_fd-selftests.c (test_destroy, test_release):
Use gdb_mkostemp_cloexec.
* gnulib/aclocal-m4-deps.mk, gnulib/aclocal.m4,
gnulib/config.in, gnulib/configure,
gnulib/import/Makefile.am, gnulib/import/Makefile.in,
gnulib/import/m4/gnulib-cache.m4,
gnulib/import/m4/gnulib-comp.m4: Update.
* gnulib/import/m4/mkostemp.m4: New file.
* gnulib/import/m4/mkstemp.m4: Remove.
* gnulib/import/mkostemp.c: New file.
* gnulib/import/mkstemp.m4: Remove.
* gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Remove
mkstemp, add mkostemp. Apply new patch.
* gnulib/import/stdlib.in.h: Apply patch.
* gnulib/patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch:
New file.
* dwarf-index-write.c (write_psymtabs_to_index): Use
gdb_mkostemp_cloexec.
* common/filestuff.h (gdb_mkostemp_cloexec): New function.
Diffstat (limited to 'gdb/common')
| -rw-r--r-- | gdb/common/filestuff.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gdb/common/filestuff.h b/gdb/common/filestuff.h index ecfc18d..9a12f83 100644 --- a/gdb/common/filestuff.h +++ b/gdb/common/filestuff.h @@ -20,6 +20,7 @@ #define FILESTUFF_H #include <dirent.h> +#include <fcntl.h> /* Note all the file descriptors which are open when this is called. These file descriptors will not be closed by close_most_fds. */ @@ -48,6 +49,16 @@ extern void close_most_fds (void); extern int gdb_open_cloexec (const char *filename, int flags, /* mode_t */ unsigned long mode); +/* Like mkstemp, but ensures that the file descriptor is + close-on-exec. */ + +static inline int +gdb_mkostemp_cloexec (char *name_template, int flags = 0) +{ + /* gnulib provides a mkostemp replacement if needed. */ + return mkostemp (name_template, flags | O_CLOEXEC); +} + /* Convenience wrapper for the above, which takes the filename as an std::string. */ |