projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: set FD_CLOEXEC on incoming FDs.
[lttng-ust.git]
/
liblttng-ust-comm
/
lttng-ust-comm.c
diff --git
a/liblttng-ust-comm/lttng-ust-comm.c
b/liblttng-ust-comm/lttng-ust-comm.c
index 4ed9cc6edc8931061e2cc52fa97964f6bb4d7969..46f2e9e3343d0b36b45c919bf2755294fd281ff9 100644
(file)
--- a/
liblttng-ust-comm/lttng-ust-comm.c
+++ b/
liblttng-ust-comm/lttng-ust-comm.c
@@
-106,6
+106,7
@@
int ustcomm_connect_unix_sock(const char *pathname, long timeout)
/*
* libust threads require the close-on-exec flag for all
* resources so it does not leak file descriptors upon exec.
/*
* libust threads require the close-on-exec flag for all
* resources so it does not leak file descriptors upon exec.
+ * SOCK_CLOEXEC is not used since it is linux specific.
*/
fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
*/
fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
@@
-451,6
+452,7
@@
ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
char recv_fd[CMSG_SPACE(sizeof_fds)];
struct msghdr msg;
char dummy;
char recv_fd[CMSG_SPACE(sizeof_fds)];
struct msghdr msg;
char dummy;
+ int i;
memset(&msg, 0, sizeof(msg));
memset(&msg, 0, sizeof(msg));
@@
-506,7
+508,18
@@
ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
ret = -1;
goto end;
}
ret = -1;
goto end;
}
+
memcpy(fds, CMSG_DATA(cmsg), sizeof_fds);
memcpy(fds, CMSG_DATA(cmsg), sizeof_fds);
+
+ /* Set FD_CLOEXEC */
+ for (i = 0; i < nb_fd; i++) {
+ ret = fcntl(fds[i], F_SETFD, FD_CLOEXEC);
+ if (ret < 0) {
+ PERROR("fcntl failed to set FD_CLOEXEC on fd %d",
+ fds[i]);
+ }
+ }
+
ret = nb_fd;
end:
return ret;
ret = nb_fd;
end:
return ret;
This page took
0.023802 seconds
and
4
git commands to generate.