d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use O_CLOEXEC when opening persistent handles in libdtrace.

Browse Source 
PR:		199810
Submitted by:	jau@iki.fi
MFC after:	1 week
This commit is contained in:
markj 2017-09-05 00:11:06 +00:00
parent ac2a969f03
commit 5058635597
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
View File

@ -963,7 +963,7 @@ dt_provmod_open(dt_provmod_t **provmod, dt_fdlist_t *dfp)
(void) snprintf(path, sizeof (path), "/dev/dtrace/%s", p1); (void) snprintf(path, sizeof (path), "/dev/dtrace/%s", p1);
if ((fd = open(path, O_RDONLY)) == -1) if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1)
continue; /* failed to open driver; just skip it */ continue; /* failed to open driver; just skip it */
if (((prov = malloc(sizeof (dt_provmod_t))) == NULL) || if (((prov = malloc(sizeof (dt_provmod_t))) == NULL) ||
@ -1100,7 +1100,7 @@ dt_vopen(int version, int flags, int *errp,
*/ */
dt_provmod_open(&provmod, &df); dt_provmod_open(&provmod, &df);
dtfd = open("/dev/dtrace/dtrace", O_RDWR); dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC);
err = errno; /* save errno from opening dtfd */ err = errno; /* save errno from opening dtfd */
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
/* /*
@ -1116,7 +1116,7 @@ dt_vopen(int version, int flags, int *errp,
#ifdef illumos #ifdef illumos
ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR); ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR);
#else #else
ftfd = open("/dev/dtrace/fasttrap", O_RDWR); ftfd = open("/dev/dtrace/fasttrap", O_RDWR | O_CLOEXEC);
#endif #endif
fterr = ftfd == -1 ? errno : 0; /* save errno from open ftfd */ fterr = ftfd == -1 ? errno : 0; /* save errno from open ftfd */
@ -1146,9 +1146,6 @@ dt_vopen(int version, int flags, int *errp,
return (set_open_errno(dtp, errp, err)); return (set_open_errno(dtp, errp, err));
} }
(void) fcntl(dtfd, F_SETFD, FD_CLOEXEC);
(void) fcntl(ftfd, F_SETFD, FD_CLOEXEC);
alloc: alloc:
if ((dtp = malloc(sizeof (dtrace_hdl_t))) == NULL) { if ((dtp = malloc(sizeof (dtrace_hdl_t))) == NULL) {
dt_provmod_destroy(&provmod); dt_provmod_destroy(&provmod);