projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: setuid/setgid daemons should not get sensitive env. var./args
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
live.c
diff --git
a/src/bin/lttng-relayd/live.c
b/src/bin/lttng-relayd/live.c
index 756efbedef8434c7126148a7fbdb09e28c57e1e5..ed52012407be36ef76a04d1c494a028d148bf6cd 100644
(file)
--- a/
src/bin/lttng-relayd/live.c
+++ b/
src/bin/lttng-relayd/live.c
@@
-712,7
+712,12
@@
int viewer_connect(struct relay_connection *conn)
reply.major = htobe32(reply.major);
reply.minor = htobe32(reply.minor);
if (conn->type == RELAY_VIEWER_COMMAND) {
reply.major = htobe32(reply.major);
reply.minor = htobe32(reply.minor);
if (conn->type == RELAY_VIEWER_COMMAND) {
- reply.viewer_session_id = htobe64(++last_relay_viewer_session_id);
+ /*
+ * Increment outside of htobe64 macro, because can be used more than once
+ * within the macro, and thus the operation may be undefined.
+ */
+ last_relay_viewer_session_id++;
+ reply.viewer_session_id = htobe64(last_relay_viewer_session_id);
}
health_code_update();
}
health_code_update();
@@
-2102,7
+2107,10
@@
int relayd_live_create(struct lttng_uri *uri,
cds_wfcq_init(&viewer_conn_queue.head, &viewer_conn_queue.tail);
/* Set up max poll set size */
cds_wfcq_init(&viewer_conn_queue.head, &viewer_conn_queue.tail);
/* Set up max poll set size */
- lttng_poll_set_max_size();
+ if (lttng_poll_set_max_size()) {
+ retval = -1;
+ goto exit_init_data;
+ }
/* Setup the dispatcher thread */
ret = pthread_create(&live_dispatcher_thread, NULL,
/* Setup the dispatcher thread */
ret = pthread_create(&live_dispatcher_thread, NULL,
@@
-2139,13
+2147,11
@@
int relayd_live_create(struct lttng_uri *uri,
*/
return retval;
*/
return retval;
+ /*
+ * Join on the live_listener_thread should anything be added after
+ * the live_listener thread's creation.
+ */
- ret = pthread_join(live_listener_thread, &status);
- if (ret) {
- errno = ret;
- PERROR("pthread_join live listener");
- retval = -1;
- }
exit_listener_thread:
ret = pthread_join(live_worker_thread, &status);
exit_listener_thread:
ret = pthread_join(live_worker_thread, &status);
This page took
0.026003 seconds
and
5
git commands to generate.