projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: NULL passed to memcpy in error path
[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 e2096eccd3897b5a500ebaabbe8ea5ecfac1cd90..8a8550f40f60a9a888cf36c8f62d6509f8d3580b 100644
(file)
--- a/
src/bin/lttng-relayd/live.c
+++ b/
src/bin/lttng-relayd/live.c
@@
-654,12
+654,16
@@
void *thread_dispatcher(void *data)
health_code_update();
health_code_update();
-
while (!CMM_LOAD_SHARED(live_dispatch_thread_exit)
) {
+
for (;;
) {
health_code_update();
/* Atomically prepare the queue futex */
futex_nto1_prepare(&viewer_conn_queue.futex);
health_code_update();
/* Atomically prepare the queue futex */
futex_nto1_prepare(&viewer_conn_queue.futex);
+ if (CMM_LOAD_SHARED(live_dispatch_thread_exit)) {
+ break;
+ }
+
do {
health_code_update();
do {
health_code_update();
@@
-1122,8
+1126,8
@@
error:
/*
* Open the index file if needed for the given vstream.
*
/*
* Open the index file if needed for the given vstream.
*
- * If an index file is successfully opened, the vstream
index_fd set with
- *
it
.
+ * If an index file is successfully opened, the vstream
will set it as its
+ *
current index file
.
*
* Return 0 on success, a negative value on error (-ENOENT if not ready yet).
*
*
* Return 0 on success, a negative value on error (-ENOENT if not ready yet).
*
@@
-1134,7
+1138,7
@@
static int try_open_index(struct relay_viewer_stream *vstream,
{
int ret = 0;
{
int ret = 0;
- if (vstream->index_f
d
) {
+ if (vstream->index_f
ile
) {
goto end;
}
goto end;
}
@@
-1145,20
+1149,12
@@
static int try_open_index(struct relay_viewer_stream *vstream,
ret = -ENOENT;
goto end;
}
ret = -ENOENT;
goto end;
}
- ret = index_open(vstream->path_name, vstream->channel_name,
+ vstream->index_file = lttng_index_file_open(vstream->path_name,
+ vstream->channel_name,
vstream->stream->tracefile_count,
vstream->current_tracefile_id);
vstream->stream->tracefile_count,
vstream->current_tracefile_id);
- if (ret >= 0) {
- vstream->index_fd = stream_fd_create(ret);
- if (!vstream->index_fd) {
- if (close(ret)) {
- PERROR("close");
- }
- ret = -1;
- } else {
- ret = 0;
- }
- goto end;
+ if (!vstream->index_file) {
+ ret = -1;
}
end:
}
end:
@@
-1182,10
+1178,13
@@
static int check_index_status(struct relay_viewer_stream *vstream,
{
int ret;
{
int ret;
- if (
trace->session->connection_closed
+ if (
(trace->session->connection_closed || rstream->closed)
&& rstream->index_received_seqcount
== vstream->index_sent_seqcount) {
&& rstream->index_received_seqcount
== vstream->index_sent_seqcount) {
- /* Last index sent and session connection is closed. */
+ /*
+ * Last index sent and session connection or relay
+ * stream are closed.
+ */
index->status = htobe32(LTTNG_VIEWER_INDEX_HUP);
goto hup;
} else if (rstream->beacon_ts_end != -1ULL &&
index->status = htobe32(LTTNG_VIEWER_INDEX_HUP);
goto hup;
} else if (rstream->beacon_ts_end != -1ULL &&
@@
-1277,7
+1276,6
@@
static
int viewer_get_next_index(struct relay_connection *conn)
{
int ret;
int viewer_get_next_index(struct relay_connection *conn)
{
int ret;
- ssize_t read_ret;
struct lttng_viewer_get_next_index request_index;
struct lttng_viewer_index viewer_index;
struct ctf_packet_index packet_index;
struct lttng_viewer_get_next_index request_index;
struct lttng_viewer_index viewer_index;
struct ctf_packet_index packet_index;
@@
-1400,11
+1398,10
@@
int viewer_get_next_index(struct relay_connection *conn)
viewer_index.flags |= LTTNG_VIEWER_FLAG_NEW_STREAM;
}
viewer_index.flags |= LTTNG_VIEWER_FLAG_NEW_STREAM;
}
- read_ret = lttng_read(vstream->index_fd->fd, &packet_index,
- sizeof(packet_index));
- if (read_ret < sizeof(packet_index)) {
- ERR("Relay reading index file %d returned %zd",
- vstream->index_fd->fd, read_ret);
+ ret = lttng_index_file_read(vstream->index_file, &packet_index);
+ if (ret) {
+ ERR("Relay error reading index file %d",
+ vstream->index_file->fd);
viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR);
goto send_reply;
} else {
viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR);
goto send_reply;
} else {
@@
-1485,13
+1482,14
@@
error_put:
static
int viewer_get_packet(struct relay_connection *conn)
{
static
int viewer_get_packet(struct relay_connection *conn)
{
- int ret, send_data = 0;
- char *data = NULL;
- uint32_t len = 0;
- ssize_t read_len;
+ int ret;
+ char *reply = NULL;
struct lttng_viewer_get_packet get_packet_info;
struct lttng_viewer_get_packet get_packet_info;
- struct lttng_viewer_trace_packet reply;
+ struct lttng_viewer_trace_packet reply
_header
;
struct relay_viewer_stream *vstream = NULL;
struct relay_viewer_stream *vstream = NULL;
+ uint32_t reply_size = sizeof(reply_header);
+ uint32_t packet_data_len = 0;
+ ssize_t read_len;
DBG2("Relay get data packet");
DBG2("Relay get data packet");
@@
-1505,25
+1503,27
@@
int viewer_get_packet(struct relay_connection *conn)
health_code_update();
/* From this point on, the error label can be reached. */
health_code_update();
/* From this point on, the error label can be reached. */
- memset(&reply
, 0, sizeof(reply
));
+ memset(&reply
_header, 0, sizeof(reply_header
));
vstream = viewer_stream_get_by_id(be64toh(get_packet_info.stream_id));
if (!vstream) {
DBG("Client requested packet of unknown stream id %" PRIu64,
be64toh(get_packet_info.stream_id));
vstream = viewer_stream_get_by_id(be64toh(get_packet_info.stream_id));
if (!vstream) {
DBG("Client requested packet of unknown stream id %" PRIu64,
be64toh(get_packet_info.stream_id));
- reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR);
+ reply
_header
.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR);
goto send_reply_nolock;
goto send_reply_nolock;
+ } else {
+ packet_data_len = be32toh(get_packet_info.len);
+ reply_size += packet_data_len;
}
}
- pthread_mutex_lock(&vstream->stream->lock);
-
- len = be32toh(get_packet_info.len);
- data = zmalloc(len);
- if (!data) {
- PERROR("relay data zmalloc");
+ reply = zmalloc(reply_size);
+ if (!reply) {
+ PERROR("packet reply zmalloc");
+ reply_size = sizeof(reply_header);
goto error;
}
goto error;
}
+ pthread_mutex_lock(&vstream->stream->lock);
ret = lseek(vstream->stream_fd->fd, be64toh(get_packet_info.offset),
SEEK_SET);
if (ret < 0) {
ret = lseek(vstream->stream_fd->fd, be64toh(get_packet_info.offset),
SEEK_SET);
if (ret < 0) {
@@
-1531,50
+1531,50
@@
int viewer_get_packet(struct relay_connection *conn)
be64toh(get_packet_info.offset));
goto error;
}
be64toh(get_packet_info.offset));
goto error;
}
- read_len = lttng_read(vstream->stream_fd->fd, data, len);
- if (read_len < len) {
+ read_len = lttng_read(vstream->stream_fd->fd,
+ reply + sizeof(reply_header),
+ packet_data_len);
+ if (read_len < packet_data_len) {
PERROR("Relay reading trace file, fd: %d, offset: %" PRIu64,
vstream->stream_fd->fd,
be64toh(get_packet_info.offset));
goto error;
}
PERROR("Relay reading trace file, fd: %d, offset: %" PRIu64,
vstream->stream_fd->fd,
be64toh(get_packet_info.offset));
goto error;
}
- reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_OK);
- reply.len = htobe32(len);
- send_data = 1;
+ reply_header.status = htobe32(LTTNG_VIEWER_GET_PACKET_OK);
+ reply_header.len = htobe32(packet_data_len);
goto send_reply;
error:
goto send_reply;
error:
- reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR);
+ reply
_header
.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR);
send_reply:
if (vstream) {
pthread_mutex_unlock(&vstream->stream->lock);
}
send_reply_nolock:
send_reply:
if (vstream) {
pthread_mutex_unlock(&vstream->stream->lock);
}
send_reply_nolock:
- reply.flags = htobe32(reply.flags);
health_code_update();
health_code_update();
- ret = send_response(conn->sock, &reply, sizeof(reply));
- if (ret < 0) {
- goto end_free;
+ if (reply) {
+ memcpy(reply, &reply_header, sizeof(reply_header));
+ ret = send_response(conn->sock, reply, reply_size);
+ } else {
+ /* No reply to send. */
+ ret = send_response(conn->sock, &reply_header,
+ reply_size);
}
}
- health_code_update();
- if (send_data) {
- health_code_update();
- ret = send_response(conn->sock, data, len);
- if (ret < 0) {
- goto end_free;
- }
- health_code_update();
+ health_code_update();
+ if (ret < 0) {
+ PERROR("sendmsg of packet data failed");
+ goto end_free;
}
}
- DBG("Sent %u bytes for stream %" PRIu64,
len
,
+ DBG("Sent %u bytes for stream %" PRIu64,
reply_size
,
be64toh(get_packet_info.stream_id));
end_free:
be64toh(get_packet_info.stream_id));
end_free:
- free(
data
);
+ free(
reply
);
end:
if (vstream) {
viewer_stream_put(vstream);
end:
if (vstream) {
viewer_stream_put(vstream);
@@
-2186,7
+2186,7
@@
int relayd_live_create(struct lttng_uri *uri)
}
/* Setup the dispatcher thread */
}
/* Setup the dispatcher thread */
- ret = pthread_create(&live_dispatcher_thread,
NULL
,
+ ret = pthread_create(&live_dispatcher_thread,
default_pthread_attr()
,
thread_dispatcher, (void *) NULL);
if (ret) {
errno = ret;
thread_dispatcher, (void *) NULL);
if (ret) {
errno = ret;
@@
-2196,7
+2196,7
@@
int relayd_live_create(struct lttng_uri *uri)
}
/* Setup the worker thread */
}
/* Setup the worker thread */
- ret = pthread_create(&live_worker_thread,
NULL
,
+ ret = pthread_create(&live_worker_thread,
default_pthread_attr()
,
thread_worker, NULL);
if (ret) {
errno = ret;
thread_worker, NULL);
if (ret) {
errno = ret;
@@
-2206,7
+2206,7
@@
int relayd_live_create(struct lttng_uri *uri)
}
/* Setup the listener thread */
}
/* Setup the listener thread */
- ret = pthread_create(&live_listener_thread,
NULL
,
+ ret = pthread_create(&live_listener_thread,
default_pthread_attr()
,
thread_listener, (void *) NULL);
if (ret) {
errno = ret;
thread_listener, (void *) NULL);
if (ret) {
errno = ret;
This page took
0.027382 seconds
and
4
git commands to generate.