Author: markj
Date: Tue Sep 5 00:11:06 2017
New Revision: 323166
URL: https://svnweb.freebsd.org/changeset/base/323166
Log:
Use O_CLOEXEC when opening persistent handles in libdtrace.
PR: 199810
Submitted by: j...@iki.fi
MFC after: 1 week
Modified:
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Mon Sep
4 22:37:28 2017 (r323165)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Tue Sep
5 00:11:06 2017 (r323166)
@@ -963,7 +963,7 @@ dt_provmod_open(dt_provmod_t **provmod, dt_fdlist_t *d
(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 */
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);
- dtfd = open("/dev/dtrace/dtrace", O_RDWR);
+ dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC);
err = errno; /* save errno from opening dtfd */
#if defined(__FreeBSD__)
/*
@@ -1116,7 +1116,7 @@ dt_vopen(int version, int flags, int *errp,
#ifdef illumos
ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR);
#else
- ftfd = open("/dev/dtrace/fasttrap", O_RDWR);
+ ftfd = open("/dev/dtrace/fasttrap", O_RDWR | O_CLOEXEC);
#endif
fterr = ftfd == -1 ? errno : 0; /* save errno from open ftfd */
@@ -1145,9 +1145,6 @@ dt_vopen(int version, int flags, int *errp,
}
return (set_open_errno(dtp, errp, err));
}
-
- (void) fcntl(dtfd, F_SETFD, FD_CLOEXEC);
- (void) fcntl(ftfd, F_SETFD, FD_CLOEXEC);
alloc:
if ((dtp = malloc(sizeof (dtrace_hdl_t))) == NULL) {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
