X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=814ccde17954b82200242e4ec03304907c2fac5c;hb=43eeccf8257eb07301bab9814f2c9fadbfd9b2ff;hp=679b40e6e40725a60bc166cfd2e4d2dc88f8d5d6;hpb=b33b46f7161604cb9168e9bbc854413cf18269be;p=lttng-ust.git diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c index 679b40e6..814ccde1 100644 --- a/liblttng-ust-comm/lttng-ust-comm.c +++ b/liblttng-ust-comm/lttng-ust-comm.c @@ -19,6 +19,7 @@ #define _GNU_SOURCE #include +#include #include #include #include @@ -106,6 +107,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. + * SOCK_CLOEXEC is not used since it is linux specific. */ fd = socket(PF_UNIX, SOCK_STREAM, 0); if (fd < 0) { @@ -438,8 +440,6 @@ ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) /* * Recv a message accompanied by fd(s) from a unix socket. * - * Returns the size of received data, or negative error value. - * * Expect at most "nb_fd" file descriptors. Returns the number of fd * actually received in nb_fd. * Returns -EPIPE on orderly shutdown. @@ -453,6 +453,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; + int i; memset(&msg, 0, sizeof(msg)); @@ -508,8 +509,19 @@ ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd) ret = -1; goto end; } + memcpy(fds, CMSG_DATA(cmsg), sizeof_fds); - ret = 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; } @@ -630,12 +642,12 @@ ssize_t ustcomm_recv_channel_from_sessiond(int sock, ret = lttng_ust_add_fd_to_tracker(wakeup_fd); if (ret < 0) { - lttng_ust_unlock_fd_tracker(); ret = close(wakeup_fd); if (ret) { PERROR("close on wakeup_fd"); } len = -EIO; + lttng_ust_unlock_fd_tracker(); goto error_recv; } @@ -676,19 +688,18 @@ int ustcomm_recv_stream_from_sessiond(int sock, ret = lttng_ust_add_fd_to_tracker(fds[0]); if (ret < 0) { - lttng_ust_unlock_fd_tracker(); ret = close(fds[0]); if (ret) { PERROR("close on received shm_fd"); } ret = -EIO; + lttng_ust_unlock_fd_tracker(); goto error; } *shm_fd = ret; ret = lttng_ust_add_fd_to_tracker(fds[1]); if (ret < 0) { - lttng_ust_unlock_fd_tracker(); ret = close(*shm_fd); if (ret) { PERROR("close on shm_fd"); @@ -699,6 +710,7 @@ int ustcomm_recv_stream_from_sessiond(int sock, PERROR("close on received wakeup_fd"); } ret = -EIO; + lttng_ust_unlock_fd_tracker(); goto error; } *wakeup_fd = ret; @@ -853,12 +865,15 @@ static int serialize_integer_type(struct ustctl_integer_type *uit, const struct lttng_integer_type *lit) { + int32_t encoding; + uit->size = lit->size; uit->signedness = lit->signedness; uit->reverse_byte_order = lit->reverse_byte_order; uit->base = lit->base; - if (serialize_string_encoding(&uit->encoding, lit->encoding)) + if (serialize_string_encoding(&encoding, lit->encoding)) return -EINVAL; + uit->encoding = encoding; uit->alignment = lit->alignment; return 0; } @@ -880,9 +895,11 @@ int serialize_basic_type(struct lttng_session *session, } case atype_string: { - if (serialize_string_encoding(&ubt->string.encoding, - lbt->string.encoding)) + int32_t encoding; + + if (serialize_string_encoding(&encoding, lbt->string.encoding)) return -EINVAL; + ubt->string.encoding = encoding; *uatype = ustctl_atype_string; break; } @@ -1007,13 +1024,15 @@ int serialize_one_field(struct lttng_session *session, { struct ustctl_field *uf = &fields[*iter_output]; struct ustctl_type *ut = &uf->type; + enum ustctl_abstract_types atype; strncpy(uf->name, lf->name, LTTNG_UST_SYM_NAME_LEN); uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; - ret = serialize_basic_type(session, &ut->atype, lt->atype, + ret = serialize_basic_type(session, &atype, lt->atype, &ut->u.basic, <->u.basic); if (ret) return ret; + ut->atype = atype; (*iter_output)++; break; } @@ -1023,6 +1042,7 @@ int serialize_one_field(struct lttng_session *session, struct ustctl_type *ut = &uf->type; struct ustctl_basic_type *ubt; const struct lttng_basic_type *lbt; + enum ustctl_abstract_types atype; strncpy(uf->name, lf->name, LTTNG_UST_SYM_NAME_LEN); uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; @@ -1030,10 +1050,11 @@ int serialize_one_field(struct lttng_session *session, ubt = &ut->u.array.elem_type; lbt = <->u.array.elem_type; ut->u.array.length = lt->u.array.length; - ret = serialize_basic_type(session, &ubt->atype, lbt->atype, + ret = serialize_basic_type(session, &atype, lbt->atype, &ubt->u.basic, &lbt->u.basic); if (ret) return -EINVAL; + ubt->atype = atype; ut->atype = ustctl_atype_array; (*iter_output)++; break; @@ -1044,6 +1065,7 @@ int serialize_one_field(struct lttng_session *session, struct ustctl_type *ut = &uf->type; struct ustctl_basic_type *ubt; const struct lttng_basic_type *lbt; + enum ustctl_abstract_types atype; int ret; strncpy(uf->name, lf->name, LTTNG_UST_SYM_NAME_LEN); @@ -1051,16 +1073,18 @@ int serialize_one_field(struct lttng_session *session, uf->type.atype = ustctl_atype_sequence; ubt = &ut->u.sequence.length_type; lbt = <->u.sequence.length_type; - ret = serialize_basic_type(session, &ubt->atype, lbt->atype, + ret = serialize_basic_type(session, &atype, lbt->atype, &ubt->u.basic, &lbt->u.basic); if (ret) return -EINVAL; + ubt->atype = atype; ubt = &ut->u.sequence.elem_type; lbt = <->u.sequence.elem_type; - ret = serialize_basic_type(session, &ubt->atype, lbt->atype, + ret = serialize_basic_type(session, &atype, lbt->atype, &ubt->u.basic, &lbt->u.basic); if (ret) return -EINVAL; + ubt->atype = atype; ut->atype = ustctl_atype_sequence; (*iter_output)++; break;